Michael Dooley 0bf1666c51 Merge changes from topic "getmodelstate-redo" ...

* changes:
  Rolling forward with indentation fix.
  Revert "Revert "Adding getModelState API to sound trigger""

2018-10-24 06:04:42 +00:00

..

java

Merge changes from topic "getmodelstate-redo"

2018-10-24 06:04:42 +00:00

jni

Merge changes from topic "getmodelstate-redo"

2018-10-24 06:04:42 +00:00

proto

Move Settings atom enums to its own file.

2018-10-23 13:04:07 -07:00

res

Merge "Add new WallpaperInfo attr settingsSliceUri."

2018-10-23 03:02:21 +00:00

tests

Merge "Push sharedUserIds info to config/sdcardfs."

2018-10-22 21:46:58 +00:00