Adrian Roos f2ebc40286 Merge "FRP: Add config flag for disabling credential FRP" into oc-mr1-dev am: 73c93f02f7 ...

am: 392a9b5c1d

Change-Id: Ifeb044d767b03c799fa028e6efc967b88fae7b53

2017-09-25 18:47:59 +00:00

..

assets

…

res

Merge "FRP: Add config flag for disabling credential FRP" into oc-mr1-dev am: 73c93f02f7

2017-09-25 18:47:59 +00:00

Android.mk

…

AndroidManifest.xml

Merge changes I82fe220e,Iff324c73,I3bd73acd

2017-09-20 14:01:49 +00:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…