OSDN Git Service

Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1...
authorXin Li <delphij@google.com>
Wed, 9 Nov 2016 20:11:40 +0000 (20:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Nov 2016 20:11:40 +0000 (20:11 +0000)
commit16090c61779d3b1656e7d72ff2371919579fbec0
treeb041428df376d8bb3d0bbc0653eadb5da9712447
parent583a7017cebb2a70c17a0b3c8df46bf9615f9318
parent7e0483fcecbee6ff4d8c9d1431651188c496b166
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev.
am: 7e0483fcec  -s ours

Change-Id: I3a351771548f827aeecf9a4c8305b907c106abc5