OSDN Git Service

Merge "Revert "Changed the ambient display setting name"" into oc-dev
authorAdrian Roos <roosa@google.com>
Wed, 19 Apr 2017 21:53:40 +0000 (21:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Apr 2017 21:53:40 +0000 (21:53 +0000)
commit1b322f62832b76929ecbbd2dbb0e484b7ad4101d
tree27092d3189370747fc9adec8e9d92a23ef46f887
parent30dd9788302756d78b5bd9940c0cb23a16e548b0
parent97d3709b25ca80eb89de9bffa709ebae59ee41fb
Merge "Revert "Changed the ambient display setting name"" into oc-dev
am: 97d3709b25

Change-Id: I6383e11eeba2470bb98822bb393dab909a0c9191