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

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

2015-06-19 06:02:54 +00: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