tree c3f033c09836108bae9509079b708ec8a53b22a4
parent 770ed6ec920ec10798c5b7a7b4850ccc0b2a531f
parent 69555fc2c8726912ae5c1afb966c8a1b9c65400b
author Amit Mahajan <amitmahajan@google.com> 1412657862 -0700
committer Amit Mahajan <amitmahajan@google.com> 1412657862 -0700

Merge commit '69555fc2' into fix-merge-conflict3

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

Change-Id: I4266f1fcc51abc79235e1738bfbc3ff48e209e0c