Alan Viverette c65c7ae635 Merge commit '6682183b' into manualmerge ...

Conflicts:
	core/res/res/values/public.xml

Change-Id: Ic91db6ee85dcd8a6b13716b600b04c78ceac4b33

2014-06-01 16:44:28 -07:00

..

android

Merge commit '6682183b' into manualmerge

2014-06-01 16:44:28 -07:00

com

am 698c8194: Merge "Fade scrim in unlock animation." into lmp-preview-dev

2014-05-31 01:56:15 +00:00

jarjar-rules.txt

…

overview.html

…