| commit | a009932a572d97e2bcc95e508d7b17953e8f8921 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Nov 09 21:13:43 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 09 21:13:43 2016 +0000 |
| tree | 09de8ee4157a68f8c9a871824199a38604bd370c | |
| parent | 2b3a352a4de24a3fc86858ae5dce14ba06aa0ce6 [diff] | |
| parent | ba293f3c284c9a748a6a23247c3e58d6b7c1f973 [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 am: 892385f520 am: 4c1922b441 am: ba293f3c28 Change-Id: I5fda98c9f3c5f0c8abd133a960e32ef058c261c2