| commit | 33449ceedfbac0bb3225dfe474fa07c8635d7079 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Nov 09 21:07:38 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 09 21:07:38 2016 +0000 |
| tree | 862eceb74a0f11b17d2ab3d6a9d7b83324ea3636 | |
| parent | 3775a39e39f696f0e11bd009c27a9a604e1717d0 [diff] | |
| parent | 4679b5553e1eaa1e7d4d20b1c5ec6ea8206789e6 [diff] |
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. am: 9b9906e9c0 -s ours am: b9634f3081 am: 9dccfbc7c8 am: 68d354abce am: 3b4f8bc034 am: 4679b5553e -s ours Change-Id: I54b9244a2cafba1c14290473e8b73fe52a2403c1