Jack Yu 82c46d11f6 resolve merge conflicts of e091985bb5 to stage-aosp-master ...

Test: Manual
Change-Id: Icaf4663abd3ad233afa3e31ff1939dbb7c07a2a5

2017-02-24 18:47:01 -08:00

..

assets

…

res

resolve merge conflicts of e091985bb5 to stage-aosp-master

2017-02-24 18:47:01 -08:00

Android.mk

…

AndroidManifest.xml

Merge "Adding Dynamic ImsService Binding (1/3)" am: 8e6b13a1c0 am: 64057ab972

2017-01-26 01:49:53 +00:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…