Felipe Leme cbbc364ec0 Merge "Add metrics (and moar logging) for when a service disables itself." into oc-mr1-dev ...

am: 6f50d16338

Change-Id: Ia7e1893b74bf043d39300b04dc3cc85b18f40d11

2017-09-22 21:11:08 +00:00

..

java

Merge "Add metrics (and moar logging) for when a service disables itself." into oc-mr1-dev

2017-09-22 21:11:08 +00:00

jni

Merge "LegacyCamera: fix wrong class name in JNI" into oc-mr1-dev

2017-09-20 19:16:50 +00:00

proto/android

…

res

Merge "Move non-public intent out of the public namespace" into oc-mr1-dev

2017-09-22 10:31:43 +00:00

tests

Merge "Allow to enable WAL for testing" into oc-mr1-dev

2017-09-19 16:51:50 +00:00