| commit | db984f917c2ca09b3245ede9dbea13b50e729ede | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Nov 11 00:13:50 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Nov 11 00:13:50 2016 +0000 |
| tree | 0da7a0de0309125af68ea92e313e479588bdaa66 | |
| parent | 921dd6a5fde634cb4f37aba53d6d887064a1298f [diff] | |
| parent | ae5db8a6dcc06fb65a1494d52f2956ef770006e1 [diff] |
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev am: 78f15948fb am: 34de2a2d45 -s ours am: a5c82e7dd9 am: ca2abc5b71 am: ae5db8a6dc Change-Id: I0a88888750b666eb24c5ba4ad4f08346e36a5bca