| commit | 685006cf44166e841d2a015b9e95047b827cb070 | [log] [tgz] |
|---|---|---|
| author | Todd Kjos <tkjos@google.com> | Wed Nov 18 19:18:07 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 18 19:18:07 2015 +0000 |
| tree | 600df82bf78db88751059db0f7685fe40f908db7 | |
| parent | 7454190acd48d8aff8d3326c3ef26de2d34286ae [diff] | |
| parent | 88b5892d74978df60585ce59dd283d188fecdafa [diff] |
resolve merge conflicts of ed60788968 to mnc-dr2-dev-plus-aosp. am: 88b5892d74 * commit '88b5892d74978df60585ce59dd283d188fecdafa':