| commit | 05a61276c6cc0c6cc18b8064b173c5cae2c3356c | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Nov 14 12:55:17 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Nov 14 12:55:17 2016 +0000 |
| tree | 777387021c9acda9e968bac6cd6241328c390c08 | |
| parent | 11b3161c414c04417eeb9df96dad895acdbe861d [diff] | |
| parent | 921dd6a5fde634cb4f37aba53d6d887064a1298f [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 Change-Id: Iffc4ed4a45701d533a0b6d24daaa137982554057