| commit | eb4de1706e9816c4873b19556d8343b22bfdc972 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Nov 14 13:39:25 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Nov 14 13:39:25 2016 +0000 |
| tree | 15b0273278c357a2c240eb14d7ef21c4e3274ec7 | |
| parent | f3e0e13b54ef07b61d7c164dff4225585cfef5a1 [diff] | |
| parent | 6e8fef24d93cb2bdc1ec7eed1bfc988e2de2167b [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 Change-Id: I43f556df4700c9470a0df500eadddcbcd8146cf7