OSDN Git Service

Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow...
authorXin Li <delphij@google.com>
Wed, 9 Nov 2016 20:34:42 +0000 (20:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Nov 2016 20:34:42 +0000 (20:34 +0000)
commitd167a27c1f0a86e871e3743c4f93a9734493c97a
tree11509652ecc97f0671cbce7945d5ef11da72e260
parent12f98789bfaa0b8217614fdf40ef36d3aa67ce19
parent84a9614947394543719e1beecd6229bc2d9a6970
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f  -s ours am: 6166af96ba am: 63c9a312a2
am: 84a9614947  -s ours

Change-Id: I0a1887ae82111b39e1dea53fadea452bc522c2ae