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:11:38 +0000 (20:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Nov 2016 20:11:38 +0000 (20:11 +0000)
commitb9634f3081ec902a2090ab74a4f96a1673e4b1cc
treebbf8558200f306d39216a2ed1d5ed108efed3b8d
parente9cd3aea196c813b18eb2c0f6e9c5c12efe66f9a
parent9b9906e9c017d84e722d9419d1025272db4bb582
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev.
am: 9b9906e9c0  -s ours

Change-Id: I3456ce6db555dfed284003579ef24d70ae99d13c