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)
am: 00c553e1ba  -s ours

Change-Id: I7e41e24257827c592a15ef446c95dd173a5b055c


Trivial merge