OSDN Git Service

Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop...
authorXin Li <delphij@google.com>
Mon, 14 Nov 2016 12:56:36 +0000 (12:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 14 Nov 2016 12:56:36 +0000 (12:56 +0000)
commitee6b51a05b24707723de38eb84e8760183264ca8
tree777387021c9acda9e968bac6cd6241328c390c08
parent05a61276c6cc0c6cc18b8064b173c5cae2c3356c
parentdb984f917c2ca09b3245ede9dbea13b50e729ede
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 am: ca2abc5b71 am: ae5db8a6dc
am: db984f917c  -s ours

Change-Id: Ib1df6a08c3f6a2e379f7d4ffac944c2169336f11