OSDN Git Service

Merge "Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev...
authorjackqdyulei <jackqdyulei@google.com>
Fri, 9 Jun 2017 08:40:10 +0000 (08:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Jun 2017 08:40:10 +0000 (08:40 +0000)
commit74cccfd1df5a99a7df89878344852f4433869167
tree7a1378d15508582ffe1cbdfbaf4e69add6da2958
parent94a34e48a6af162ead7880d3a4fed6bb7ad8118c
parent5f86be6cce9b8d27a9f8d4ada1d0771ec7c54a3d
Merge "Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev am: 4f02eebab8 am: 3aae1f336e  -s ours" into oc-dr1-dev-plus-aosp
am: 5f86be6cce  -s ours

Change-Id: I463463084d959b1e3e9c20a429686040d050c72e