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:23:02 +0000 (20:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Nov 2016 20:23:02 +0000 (20:23 +0000)
commit9dccfbc7c84ec2575a5375d7c8ac6992096e20ba
tree3d30bdc6f6a832bec3e39268d75f6921cedebae9
parent197da1f978527f82940890d37f07be657d6af741
parentb9634f3081ec902a2090ab74a4f96a1673e4b1cc
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. am: 9b9906e9c0  -s ours
am: b9634f3081

Change-Id: Icd07d2224a1b58800f7344ff3b7928b335904446