| commit | 9d04aa4f81c1275b6cf761f21418adf155e14719 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Nov 14 13:49:59 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Nov 14 13:49:59 2016 +0000 |
| tree | 65a5045f312372a59075bb36d319c2f2c632912a | |
| parent | 3a86cff442d79924803d3efc46ebb31022bb97c1 [diff] | |
| parent | eb4de1706e9816c4873b19556d8343b22bfdc972 [diff] |
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev am: 78f15948fb am: 34de2a2d45 -s ours am: a5c82e7dd9 am: ca2abc5b71 am: ae5db8a6dc am: db984f917c -s ours am: ee6b51a05b am: 20def2e75f am: 6e8fef24d9 am: eb4de1706e Change-Id: I1a405d53ae83b3e227f258d8aded7c9e1c0d6e88