OSDN Git Service

Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmal...
authorXin Li <delphij@google.com>
Tue, 8 Nov 2016 21:25:38 +0000 (21:25 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 8 Nov 2016 21:25:43 +0000 (21:25 +0000)
commitcc115c59312d5e4a9b4c63a80ecd0044b40b98d4
treefd49b2cbaaefbd0d0a7a2334571fd0e183f4975e
parent34849c22e78274fe25b96b3e7bd8bd7c65a9487d
parentee2903686f9566a0563bdb7a263ab58454c2634a
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev