OSDN Git Service

Merge "DO NOT MERGE - Added Emergency affordance feature" am: a0322d5c5a -s ours
authorSelim Cinek <cinek@google.com>
Thu, 13 Oct 2016 14:18:41 +0000 (14:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Oct 2016 14:18:41 +0000 (14:18 +0000)
commit8f681f72200e01c48616d2b2f84fc54bc3ba88e8
treed56d169ee7260c56d7c40ee62025d6645f05b48a
parentd975003af3e5b8365b2107fc9b6029b11ca9c88e
parent00c553e1ba009efdeb8034ad3095623fb02fab49
Merge "DO NOT MERGE - Added Emergency affordance feature" am: a0322d5c5a  -s ours
am: 00c553e1ba  -s ours

Change-Id: I7e41e24257827c592a15ef446c95dd173a5b055c