| commit | 34de2a2d4507c366cfc791bc454e75efef6a4cdd | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Nov 09 20:11:44 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 09 20:11:44 2016 +0000 |
| tree | b041428df376d8bb3d0bbc0653eadb5da9712447 | |
| parent | 16090c61779d3b1656e7d72ff2371919579fbec0 [diff] | |
| parent | 78f15948fb63bdcfc326a3ce00d86495ead76976 [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 Change-Id: I5f5509cd98a6a98ce9edc782e9d8ef9093fa86e4