Richard Uhler 58ccf0e41e resolve merge conflicts of 617d382303 to pi-dev-plus-aosp ...

Test: None
Bug: 113942223
Change-Id: I0ce0db080c355b259b6140cc67772b8400e46b82
Merged-In: I1b65a8bee81f1d190c587cf65cb55da64a184284

2018-11-02 11:19:57 +00:00

..

assets

…

res

resolve merge conflicts of 617d382303 to pi-dev-plus-aosp

2018-11-02 11:19:57 +00:00

Android.bp

…

AndroidManifest.xml

Merge "Protect TelephonyManager.ACTION_SECRET_CODE" am: 68a544d209

2018-11-01 18:47:40 -07:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…