commit | 478dcb35d69ab34b7b864182c3c1d7ad6bee67ec | [log] [tgz] |
---|---|---|
author | Adrian Roos <roosa@google.com> | Wed Apr 19 22:13:21 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Apr 19 22:13:21 2017 +0000 |
tree | 352d93efcca966dce9842d364e9a0edb71042b6f | |
parent | db654c88bce38eb1bcfb05d614021dae2f2006ab [diff] | |
parent | 1b322f62832b76929ecbbd2dbb0e484b7ad4101d [diff] |
Merge "Revert "Changed the ambient display setting name"" into oc-dev am: 97d3709b25 am: 1b322f6283 Change-Id: Ia33ee063b87d2cc6951d6a85a88b45b14c67b229