Wei Liu 9fbee9ba98 resolved conflicts for merge of 1dac6bd9 to mnc-dev ...

Change-Id: I000b35f5e2658a065c780396254bcb88f1cbce5e

2015-06-18 22:52:37 -07:00

..

res

Import translations. DO NOT MERGE

2015-05-30 20:01:28 -07:00

src/com/android/shell

resolved conflicts for merge of 1dac6bd9 to mnc-dev

2015-06-18 22:52:37 -07:00

Android.mk

…

AndroidManifest.xml

DO NOT MERGE: Remove DayNight theme

2015-06-18 15:15:16 -07:00