OSDN Git Service

Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop...
authorXin Li <delphij@google.com>
Wed, 9 Nov 2016 20:24:12 +0000 (20:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Nov 2016 20:24:12 +0000 (20:24 +0000)
commita5c82e7dd9cf97dd2385bb07613282203d5e13b4
tree42feff59dffd963817b0e0357169bc9a15ce6444
parent0a568ae56e17ea68510b5831ccfefd4a1595c053
parent34de2a2d4507c366cfc791bc454e75efef6a4cdd
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