| commit | b9634f3081ec902a2090ab74a4f96a1673e4b1cc | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Nov 09 20:11:38 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 09 20:11:38 2016 +0000 |
| tree | bbf8558200f306d39216a2ed1d5ed108efed3b8d | |
| parent | e9cd3aea196c813b18eb2c0f6e9c5c12efe66f9a [diff] | |
| parent | 9b9906e9c017d84e722d9419d1025272db4bb582 [diff] |
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. am: 9b9906e9c0 -s ours Change-Id: I3456ce6db555dfed284003579ef24d70ae99d13c