| commit | 78f15948fb63bdcfc326a3ce00d86495ead76976 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Nov 08 21:24:12 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Nov 08 21:24:17 2016 +0000 |
| tree | d73a0b9c5d00f5f9646dfa46898ff9938109e690 | |
| parent | ec44540d4273bdfcdd4288b2edec4ea5e4a076a8 [diff] | |
| parent | 7e0483fcecbee6ff4d8c9d1431651188c496b166 [diff] |
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev