| commit | 2129e3b757e97e073228fbe6f53a52976f648e10 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Nov 14 13:57:43 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Nov 14 13:57:43 2016 +0000 |
| tree | 5e4aa8ecff4ba4ba9d21cd90ffe2fc97e660affe | |
| parent | 3fca84af7247587d8fd3e457c862713c629a7dbf [diff] | |
| parent | 3a86cff442d79924803d3efc46ebb31022bb97c1 [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 Change-Id: I4b2964c8393965be2597f48728ee0985cecc627f