OSDN Git Service

Merge "Split Ambient Display settings." into nyc-mr1-dev am: 4f8a703d51 am: f79a9b397e
authorDoris Ling <dling@google.com>
Sat, 24 Sep 2016 00:35:32 +0000 (00:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 24 Sep 2016 00:35:32 +0000 (00:35 +0000)
am: 799388df91

Change-Id: I3368cd81b3c7badf2b1acf5eb0b293c1412b8687


Trivial merge