| commit | 503661118a881c958954d60733cfdd43a938402f | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Nov 09 20:24:23 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 09 20:24:23 2016 +0000 |
| tree | dd3a6d1a536f7334726d82ac09ed9e57b9352bca | |
| parent | 84a9614947394543719e1beecd6229bc2d9a6970 [diff] | |
| parent | 71e62a40586c5919ecfe9e5dec70f81260e294ee [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 Change-Id: I0d66e9689c9ec4a2537cdd23a73ec4dbb74cfd1a