Svetoslav Ganov c7d89b4bc2 Merge "Revert "Adjust default app op behavior based on feature state""

2018-11-03 05:01:47 +00:00

..

java

Merge "Revert "Adjust default app op behavior based on feature state""

2018-11-03 05:01:47 +00:00

jni

Merge "Use canonical order for audio formats, add missing conversions"

2018-11-01 21:12:22 +00:00

proto

Merge "Match PREF_CHANGE event name and id to metrics_constants"

2018-11-02 18:35:37 +00:00

res

resolve merge conflicts of 617d382303 to pi-dev-plus-aosp

2018-11-02 11:19:57 +00:00

tests

Merge "Refactor model listing / selection code to support other types of model"

2018-11-02 16:08:41 +00:00