| commit | 892385f5203178e26e6a4386688df6826baebe4e | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Nov 09 20:44:35 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 09 20:44:35 2016 +0000 |
| tree | c9ae1d82105cc4387f229623008b530646187a3a | |
| parent | acdb6bb1aa42c126113eff8cb8df86cd42c99c94 [diff] | |
| parent | d167a27c1f0a86e871e3743c4f93a9734493c97a [diff] |
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f -s ours am: 6166af96ba am: 63c9a312a2 am: 84a9614947 -s ours am: d167a27c1f Change-Id: I6301865f95712e610ab75031fe401386a8010efd