OSDN Git Service

Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmal...
authorXin Li <delphij@google.com>
Wed, 9 Nov 2016 21:03:17 +0000 (21:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Nov 2016 21:03:17 +0000 (21:03 +0000)
am: 0326b807fa

Change-Id: I84618ae346458ff5db07a40aa6794900842bb222


Trivial merge