| commit | b5acbedeb67693f577339730e5731133966fc2e5 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Nov 09 21:08:52 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 09 21:08:52 2016 +0000 |
| tree | 862eceb74a0f11b17d2ab3d6a9d7b83324ea3636 | |
| parent | 33449ceedfbac0bb3225dfe474fa07c8635d7079 [diff] | |
| parent | d05a06d1e248d1eb90a391f6517aae806ab6c51b [diff] |
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev am: 49b144e630 am: 1a06ebfcac am: 781d8f7426 am: c8ac64aca7 am: b7f279051e am: d05a06d1e2 -s ours Change-Id: I0931d2e1abf4a28949ceec6c0d0838b4a94f488b