OSDN Git Service

Merge "Remove duplicates between battery and display settings" into oc-dev
authorMatthew Fritze <mfritze@google.com>
Sat, 22 Apr 2017 00:59:40 +0000 (00:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Apr 2017 00:59:40 +0000 (00:59 +0000)
commita95fc0f05f48a2fba029a3235fbb1660b8b214d6
treec310b0c73d104e198b597836d84ee076b7cfa1d6
parent0bf520852da6f7b9ddc1d27b71fe16d5994a99d7
parent1c7e25d3b63eb7b287b77361bddd802c1a932c9d
Merge "Remove duplicates between battery and display settings" into oc-dev
am: 1c7e25d3b6

Change-Id: I1e824de321f7d8eeb9fbcefb22048af0ae5109be