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)
commit0326b807fa011a1232f9d179c2bc59e67c1e03fc
treee3d45801d0c1853ebc7301de3384c07c7d2eebb9
parent4c1922b441464e6ed1a7bc414f0631e3e45e4549
parent0bf282606f91f4dc2b885d06ebb6a0deda586fd3
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am: cc115c5931 am: eda0b0078e am: 71e62a4058 am: 503661118a  -s ours am: 4146229e69
am: 0bf282606f

Change-Id: I52dc31670838c2d067bf262981885f5bf2be3445