| commit | 3a86cff442d79924803d3efc46ebb31022bb97c1 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Nov 14 13:45:53 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Nov 14 13:45:53 2016 +0000 |
| tree | 65a5045f312372a59075bb36d319c2f2c632912a | |
| parent | ec69d20c3d5ae248732e0776c8dfc8bd4cb22820 [diff] | |
| parent | f3e0e13b54ef07b61d7c164dff4225585cfef5a1 [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 Change-Id: I3bd3b1405acac465f3974f3cd9ff231a1800aa16