Felipe Leme 3c0555eca0 Merge "Merge changes I768830f5,I665bde3a into oc-mr1-dev am: 7876b630be" into oc-mr1-dev-plus-aosp ...

am: 08ca3cc7e8

Change-Id: I86ad97ddb4060a2fbd23e7a2105ee4c98b782b46

2017-08-17 03:04:57 +00:00

..

assets

…

res

Merge "Merge changes I768830f5,I665bde3a into oc-mr1-dev am: 7876b630be" into oc-mr1-dev-plus-aosp

2017-08-17 03:04:57 +00:00

Android.mk

…

AndroidManifest.xml

Merge "Add privileged permission for reading the current wallpaper image" into oc-mr1-dev am: 4b7b5a6c59

2017-08-16 17:15:08 +00:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…