OSDN Git Service

Merge "Add uid data even though on battery stats" into oc-mr1-dev
authorjackqdyulei <jackqdyulei@google.com>
Tue, 8 Aug 2017 19:28:39 +0000 (19:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 8 Aug 2017 19:28:39 +0000 (19:28 +0000)
commit51aac2af9e14085837906018391b947475015aaa
treee5a6d0c88c9eb7b86c1deb0a49f265e6a6f377b3
parent401156da7d0ac6fcde62bb31166a3beb89517508
parent189899c169a66c2488f7079d1cc0830d3c0ffb35
Merge "Add uid data even though on battery stats" into oc-mr1-dev
am: 189899c169

Change-Id: If77a54cbcb8dc972297fab9779b3947aa25cf020