commit | 3ba7aab582e40bfeb37aa83e74c082c687e67d84 | [log] [tgz] |
---|---|---|
author | Adrian Roos <roosa@google.com> | Tue Oct 18 22:43:36 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Oct 18 22:43:36 2016 +0000 |
tree | 1d9cff1dd6e3311b6fa2f96991cad9909a5d48a0 | |
parent | c0dfa153f4e258b30ed8a640e44940296fc905f0 [diff] | |
parent | f33b98b750b0476ae0fcd4932aa0ba2ba8722e18 [diff] |
Merge "Separate ambient display triggers" into nyc-mr1-dev am: ee5eef1492 am: f33b98b750 Change-Id: I61777d38647d8b6f858de9feadf7ae3c8a9b7ebd