summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2016-10-18 22:11:26 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-10-18 22:11:26 +0000
commit415363c6c643634248f8628fc85c7b71e93333e7 (patch)
treeef1e55430469f1581f6108590fa39f118125f1c9
parent3e66099f888e252ae97a34dee5f0c2b47d434e76 (diff)
parentf7cbd2380b0b4bcb2f874a8fb156f0892fccd851 (diff)
downloadshamu-415363c6c643634248f8628fc85c7b71e93333e7.tar.gz
Merge "Separate ambient display triggers" into nyc-mr1-dev
am: f7cbd2380b Change-Id: Ia4927050ee4f42b28130ecfe579eb036322a3c50
0 files changed, 0 insertions, 0 deletions