| commit | 66d2b4175ca87582c3effc6a9ac01cae368e2ace | [log] [tgz] |
|---|---|---|
| author | Ricky Wai <rickywai@google.com> | Mon Jun 13 15:11:31 2016 +0100 |
| committer | Ricky Wai <rickywai@google.com> | Mon Jun 13 15:11:31 2016 +0100 |
| tree | 450e743dde781ce3b1a7f4db0fcc1641973bd741 | |
| parent | 72f255c0c933122d6b3683122a940015e1d198a0 [diff] | |
| parent | 8513817a741208bdc7f97f4117da75cf05a41532 [diff] |
resolve merge conflicts of 8513817 to nyc-mr1-dev-plus-aosp Change-Id: I1b3fbe77722b34ca754667ba3e9b9c3753002c29