| commit | c4cb917fa44939da4592d2dd8c9fd90b5d66c510 | [log] [tgz] |
|---|---|---|
| author | David Sehr <sehr@google.com> | Tue Aug 23 10:38:06 2016 -0700 |
| committer | David Sehr <sehr@google.com> | Tue Aug 23 11:01:22 2016 -0700 |
| tree | f80fa1598355bcd44f8e1ef38424eaab40f9d867 | |
| parent | eca2eebed06cf4463cd5cfeacff75de1f03cac8d [diff] | |
| parent | 021c14320c8f977421abcd02373072a57add8792 [diff] |
resolve merge conflicts of 021c143 to nyc-mr1-dev-plus-aosp Change-Id: Id393568264e95ba50ffc04f75131e8cda27ee15e