OSDN Git Service

Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev...
authorXin Li <delphij@google.com>
Wed, 9 Nov 2016 20:34:01 +0000 (20:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Nov 2016 20:34:01 +0000 (20:34 +0000)
commit68d354abce77acda2ae48b877816efc7d748deef
tree0ba0f714cb29fee480df3762d015cbc62f9d1102
parent7da025f142078ba8426ed71457c3c63c8658b053
parent9dccfbc7c84ec2575a5375d7c8ac6992096e20ba
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. am: 9b9906e9c0  -s ours am: b9634f3081
am: 9dccfbc7c8

Change-Id: Ib02f82fa385a514d339331fc3f3b5309a8042fa5