| commit | 5386c74a44186c2b23e93a1a0831251fe81949af | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Nov 14 13:22:41 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Nov 14 13:22:41 2016 +0000 |
| tree | 8241690cc62378052fd95373ff931a039169c651 | |
| parent | a9fae33c11f98211424301404a1118e9b6badf15 [diff] | |
| parent | 23270f13114d17357222698d9dcc2de059d92fa7 [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 Change-Id: I242883361ff06daefe80686314e8869a3b6733f4