Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bb2c170 authored by Dirk Dougherty's avatar Dirk Dougherty
Browse files

Merge commit 'bb94d790' into manualmerge 

Conflicts:
	tools/droiddoc/templates-sdk/sample.cs

Change-Id: Ic1640c3620eb6b770bae7766af9ea5c64d74afe0
parents 6b55f007 bb94d790

tools/droiddoc/templates-sdk/sample.cs

+1 −1

File changed.

Contains only whitespace changes.