| commit | eda0b0078e0f66a9ea3b077e7587d7dcee11e607 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Nov 09 20:11:42 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 09 20:11:42 2016 +0000 |
| tree | 9ca7c0ce655604184dc101ee11ef1ff679f1fca7 | |
| parent | 6166af96ba9bbb07865ad550e5be700d42b143bb [diff] | |
| parent | cc115c59312d5e4a9b4c63a80ecd0044b40b98d4 [diff] |
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am: cc115c5931 Change-Id: I9e226ffdca4c3633061f0202da367e2be0eeeb1f