Wei Liu 00fb74c100 am f4cc2628: am 01e5cf9d: am 940335ba: Merge "resolved conflicts for merge of 1dac6bd9 to mnc-dev" into mnc-dev ...

* commit 'f4cc262847fb17f3aecd85c0b7d09e05ed937b8c':
  Wear doesn't need Shell to send notification when bugreport captured.

2015-06-19 16:25:29 +00:00

..

res

Import translations. DO NOT MERGE

2015-06-10 07:51:57 -05: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