commit | de0394887014c2fc3593855067ce2d2a1ba51a55 | [log] [tgz] |
---|---|---|
author | Matthew Fritze <mfritze@google.com> | Sat Apr 22 01:02:39 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sat Apr 22 01:02:39 2017 +0000 |
tree | 0ea9c65b6a8735e5d7fd23c09ee8062a73e64ad5 | |
parent | 4d33effa554a71b97244c404ed97b316eb2481d6 [diff] | |
parent | a95fc0f05f48a2fba029a3235fbb1660b8b214d6 [diff] |
Merge "Remove duplicates between battery and display settings" into oc-dev am: 1c7e25d3b6 am: a95fc0f05f -s ours Change-Id: I52edd436dd1a4dd97e548993de8a786c3ff17f74