| commit | 2df92b919e96f01884f291944dddbaf9be7538b9 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Nov 14 14:10:19 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Nov 14 14:10:19 2016 +0000 |
| tree | 5460a01bc269d0879c198ee5bec9d3285cc4298e | |
| parent | f5d2a4eb6a961b354e42d1a77fda6575726a41f0 [diff] | |
| parent | 2129e3b757e97e073228fbe6f53a52976f648e10 [diff] |
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev. am: 7e0483fcec -s ours am: 16090c6177 -s ours am: 0a568ae56e am: 9788dd5bd2 am: 6ec8dd10bb am: 921dd6a5fd -s ours am: 05a61276c6 am: 23270f1311 am: 5386c74a44 am: f3e0e13b54 am: 3a86cff442 am: 2129e3b757 -s ours Change-Id: Ie712c3d1613b378df3f832019bb25c78aaf7bf38