commit | a5c82e7dd9cf97dd2385bb07613282203d5e13b4 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Nov 09 20:24:12 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Nov 09 20:24:12 2016 +0000 |
tree | 42feff59dffd963817b0e0357169bc9a15ce6444 | |
parent | 0a568ae56e17ea68510b5831ccfefd4a1595c053 [diff] | |
parent | 34de2a2d4507c366cfc791bc454e75efef6a4cdd [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 Change-Id: Ifbc0ae4b514592e5e731b555bd4d393e46ad136d