Eugene Susla 68a439a706 RESTRICT AUTOMERGE am: 98f45443e1 ...

Change-Id: I3ecb22b2695c3bd60e43fb9b3d2723be179b0178

2020-04-01 20:32:06 +00:00

..

assets

…

res

DO NOT MERGE ANYWHERE: resolve merge conflicts of 77c1f60801 to oc-dr1-dev

2018-10-31 16:29:12 +00:00

Android.mk

…

AndroidManifest.xml

RESTRICT AUTOMERGE am: 98f45443e1

2020-04-01 20:32:06 +00:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…