OSDN Git Service

Merge "Split Ambient Display settings." into nyc-mr1-dev
authorDoris Ling <dling@google.com>
Sat, 24 Sep 2016 00:05:19 +0000 (00:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 24 Sep 2016 00:05:19 +0000 (00:05 +0000)
commitf79a9b397ed4b61402deef254aeed3ebce0e1898
tree8f4904659a1b643a4b905b343e93b4903a939e7e
parentf89766dbab27d9cfdc9d230fe27a4a8cac3c8631
parent4f8a703d514813dd4470c165d92f2a5e8db74ef8
Merge "Split Ambient Display settings." into nyc-mr1-dev
am: 4f8a703d51

Change-Id: I0855a17e05c387a63241bfaa5c910d4625e2e5ce