Alex Klyubin a9888fc0c4 resolve merge conflicts of febd982 to stage-aosp-master am: 5c53fdb893 ...

am: b824658494

Change-Id: Ic1dd2aef96889f0f68a55093cfb04b4d90f34818

2016-12-22 19:06:09 +00:00

..

java

resolve merge conflicts of febd982 to stage-aosp-master am: 5c53fdb893

2016-12-22 19:06:09 +00:00

jni

Merge "Fix incorrect FIFO cgroup assignment." am: d9ce420d9a

2016-12-21 02:05:58 +00:00

res

Augment diskstats dumpsys to have categorization and apps.

2016-12-21 02:23:50 +00:00

tests

Merge "Expose ScanResult#untrusted as a @SystemApi." am: a93e57f1ac am: a3943850ab

2016-12-21 20:10:30 +00:00