Ian Pedowitz e2c45a5e20 Merge "Revert "O is API 26"" into oc-dev am: b42b9a22df ...

am: c96a358318

Change-Id: If16a559a068f93f79c7c398323fe3f1bafe1aaf9

2017-05-04 00:23:27 +00:00

..

java

Merge "Revert "O is API 26"" into oc-dev am: b42b9a22df

2017-05-04 00:23:27 +00:00

jni

Merge "Add compatibility matrices to VintfObject.report()" into oc-dev am: 0e0a37635e

2017-05-03 22:55:46 +00:00

proto/android

…

res

Merge "Change MANAGE_OWN_CALLS permission to be a "normal" permission." am: 34e0a257d5

2017-05-02 20:55:45 +00:00

tests

Merge "Add compatibility matrices to VintfObject.report()" into oc-dev am: 0e0a37635e

2017-05-03 22:55:46 +00:00