Zhi An Ng 63e3339ec9 Merge "DO NOT MERGE Revert "Show dialog if top app is killed by lmk"" into oc-mr1-dev ...

am: d3dc9171d4

Change-Id: I6bf6797bdf92bfef0f4f8e23a394eaa7646460c0

2017-10-17 20:16:02 +00:00

..

java

Merge "Frameworks: Remove warning for SystemProperties.get" am: c589496ce9 am: b72c0626f5

2017-10-17 20:04:51 +00:00

jni

Merge "Add dalvik.vm.foreground-heap-growth-multiplier property" into oc-mr1-dev

2017-10-16 18:02:36 +00:00

proto/android

…

res

Merge "DO NOT MERGE Revert "Show dialog if top app is killed by lmk"" into oc-mr1-dev

2017-10-17 20:16:02 +00:00

tests

Batterystats handles nested unoptimized ble scans

2017-10-16 23:18:30 +00:00