| commit | 9c214b88396bd14e12da5546cd7db8792c2d8463 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Nov 09 21:37:49 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 09 21:37:49 2016 +0000 |
| tree | 55c4a987b41d31cfc773eac8a4325e4de9a7eb93 | |
| parent | aa437b194b9675d02ff143d6025190281eeafa24 [diff] | |
| parent | 7bd6cdf057b1c68090ea5f316a1e511d5c018145 [diff] |
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 am: 0326b807fa am: d478287ab9 am: a29c7c77b1 am: 7bd6cdf057 -s ours Change-Id: I62cc0c04b1bb35b2e1745e7eef44ba5f74a8fab4