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