Jeff Sharkey 7cf056ac8e Merge "Clarify docs, sanity check roaming state." am: 419ec05284 am: 63b5615b2a ...

am: f8590d1f79

Change-Id: I59fbe09afc74e94e2f56cb6fd833fc2deb7023e5

2017-11-27 21:48:46 +00:00

..

java

Merge "Clarify docs, sanity check roaming state." am: 419ec05284 am: 63b5615b2a

2017-11-27 21:48:46 +00:00

jni

Merge "android.os.HidlSupport: add getPidIfSharable() for HALs" am: e72b6f0d31 am: 8cf7761747

2017-11-22 23:28:56 +00:00

proto/android

Merge "Output doze mode power in BatteryStats"

2017-11-22 02:55:50 +00:00

res

Merge "Battery Saver master case changes"

2017-11-27 18:32:41 +00:00

tests

Add @Presubmit back to SettingsBackupTest

2017-11-24 16:12:08 +00:00