| commit | ca2abc5b71ea7854fa15c11f386c236ba9cf93a0 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Nov 10 23:43:39 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Nov 10 23:43:39 2016 +0000 |
| tree | 643fc3ea905eaf88c9154d702117582d14e02c94 | |
| parent | 9788dd5bd20cabbe3ff007d70841f212cce78611 [diff] | |
| parent | a5c82e7dd9cf97dd2385bb07613282203d5e13b4 [diff] |
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev am: 78f15948fb am: 34de2a2d45 -s ours am: a5c82e7dd9 Change-Id: I5ee94abbb8f6f4e8f98e8b81349ba58da3601407