| commit | 16090c61779d3b1656e7d72ff2371919579fbec0 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Nov 09 20:11:40 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 09 20:11:40 2016 +0000 |
| tree | b041428df376d8bb3d0bbc0653eadb5da9712447 | |
| parent | 583a7017cebb2a70c17a0b3c8df46bf9615f9318 [diff] | |
| parent | 7e0483fcecbee6ff4d8c9d1431651188c496b166 [diff] |
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev. am: 7e0483fcec -s ours Change-Id: I3a351771548f827aeecf9a4c8305b907c106abc5