summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2016-10-18 22:39:36 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-10-18 22:39:36 +0000
commitc73bb42fc6366cc685b167a9438ae707c5055400 (patch)
tree5188d167271464c9642da9ed4885d8ce33294758
parentd667b009e3901546a7f39ea447856203ff671da9 (diff)
parent415363c6c643634248f8628fc85c7b71e93333e7 (diff)
downloadshamu-c73bb42fc6366cc685b167a9438ae707c5055400.tar.gz
Merge "Separate ambient display triggers" into nyc-mr1-dev am: f7cbd2380b
am: 415363c6c6 Change-Id: Idc20d768785ca23ac75002d46509f3dcb8ac3713
0 files changed, 0 insertions, 0 deletions