OSDN Git Service

Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmal...
authorXin Li <delphij@google.com>
Wed, 9 Nov 2016 20:52:19 +0000 (20:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Nov 2016 20:52:19 +0000 (20:52 +0000)
am: 0bf282606f

Change-Id: I52dc31670838c2d067bf262981885f5bf2be3445


Trivial merge