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

Skip to content
Commit a97e1778 authored by Dirk Dougherty's avatar Dirk Dougherty
Browse files

Merge commit '47d3eaf6' into manualmerge 

Conflicts:
	docs/html/design/patterns/accessibility.jd
	docs/html/design/patterns/actionbar.jd
	docs/html/design/patterns/compatibility.jd
	docs/html/design/patterns/multi-pane-layouts.jd
	docs/html/design/style/iconography.jd

Change-Id: I349cf8ebc159c0a7ef0796900e2d11fe6e0c888a
parents c462073b 47d3eaf6
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment