| commit | 2fc7ea49498c546256960d7754b45b57e4bff2f1 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Nov 14 14:11:51 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Nov 14 14:11:51 2016 +0000 |
| tree | 5460a01bc269d0879c198ee5bec9d3285cc4298e | |
| parent | 2df92b919e96f01884f291944dddbaf9be7538b9 [diff] | |
| parent | 8ce3691f792c7808ea53e231e8edc40665f2a82f [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 am: db984f917c -s ours am: ee6b51a05b am: 20def2e75f am: 6e8fef24d9 am: eb4de1706e am: 9d04aa4f81 am: 8ce3691f79 -s ours Change-Id: If2967655e9fa921b303568a0855b244c0eef0d20