| commit | 4c1922b441464e6ed1a7bc414f0631e3e45e4549 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Nov 09 20:51:08 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 09 20:51:08 2016 +0000 |
| tree | e3d45801d0c1853ebc7301de3384c07c7d2eebb9 | |
| parent | e3d31ebc0e45c6a655d7f9cd0e86ed14b4554781 [diff] | |
| parent | 892385f5203178e26e6a4386688df6826baebe4e [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 Change-Id: Icd01d06e42adc1995f555cc6e6bc146baee0fce1