| commit | 8ce3691f792c7808ea53e231e8edc40665f2a82f | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Nov 14 13:59:17 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Nov 14 13:59:17 2016 +0000 |
| tree | 5e4aa8ecff4ba4ba9d21cd90ffe2fc97e660affe | |
| parent | 2129e3b757e97e073228fbe6f53a52976f648e10 [diff] | |
| parent | 9d04aa4f81c1275b6cf761f21418adf155e14719 [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 am: 9d04aa4f81 Change-Id: I5b81dc5fdec7019befcac49271f71bd8c55327a6