commit | a95fc0f05f48a2fba029a3235fbb1660b8b214d6 | [log] [tgz] |
---|---|---|
author | Matthew Fritze <mfritze@google.com> | Sat Apr 22 00:59:40 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sat Apr 22 00:59:40 2017 +0000 |
tree | c310b0c73d104e198b597836d84ee076b7cfa1d6 | |
parent | 0bf520852da6f7b9ddc1d27b71fe16d5994a99d7 [diff] | |
parent | 1c7e25d3b63eb7b287b77361bddd802c1a932c9d [diff] |
Merge "Remove duplicates between battery and display settings" into oc-dev am: 1c7e25d3b6 Change-Id: I1e824de321f7d8eeb9fbcefb22048af0ae5109be