| commit | 7e0483fcecbee6ff4d8c9d1431651188c496b166 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Oct 13 13:54:13 2016 -0700 |
| committer | Xin Li <delphij@google.com> | Thu Oct 13 13:54:54 2016 -0700 |
| tree | fb6ce6c4adca678dde57cdbf470ff6442102b3fb | |
| parent | ded4df2e791109ebabf4dfae66cf4d4fbf594b98 [diff] | |
| parent | b5b33e363be2ed48bf793890a123127e6661c5f1 [diff] |
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev. Change-Id: Ia47211f647d0d49b0adf3cb65eba4b9b686bcbff