Phil Weaver 996bc6bc12 Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714 ...

am: 9625d164e4

Change-Id: I0aa09448467dae806c9c5670ba8ed77e95a59da1

2017-07-18 23:41:26 +00:00

..

assets

…

res

DO NOT MERGE - Added translations for emergency action string

2016-10-12 23:22:58 +00:00

Android.mk

…

AndroidManifest.xml

Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714

2017-07-18 23:41:26 +00:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…