tree ca681164282469527b01fc8c9539a664c74f2845
parent 9a7659af9f32388cf22de0941a7ba5384ce23580
parent 62fbeb83811d81b46e4083672b70470404a8efff
author Doris Ling <dling@google.com> 1470354814 +0000
committer android-build-merger <android-build-merger@google.com> 1470354814 +0000

Merge "Add metrics event for Settings->Display->Ambient Display." into nyc-mr1-dev am: f32b03d124
am: 62fbeb8381

Change-Id: I9a2addc832f82e52940711986da25cc16b06ac31