| commit | 27a24d06af6e1fc0931acd48b4b992e2f0f30f61 | [log] [tgz] |
|---|---|---|
| author | Justin Yun <justinyun@google.com> | Tue Oct 31 13:20:30 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 31 13:20:30 2017 +0000 |
| tree | e0ddd87bd9d323d7987194bcb89c8277d7aecf55 | |
| parent | d807f94721a865d421a0df7796af04c28706341b [diff] | |
| parent | dac909414c2ee8a450541ccd84ee8ba05bb48516 [diff] |
resolve merge conflicts of b7062ec to oc-mr1-dev-plus-aosp am: dac909414c Change-Id: I40b4c2d6a9a74b179cd0407d082ba208df69c2ac