| commit | 94b8ed8964fe429837134ce9a0f2f78d2a75dd44 | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Fri Jul 28 20:24:07 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jul 28 20:24:07 2017 +0000 |
| tree | 0ad107beb333ee519725d6faa1aefbf2b2d0f015 | |
| parent | f8c35ac8484ae7e41dad047a4080fb36eaa63453 [diff] | |
| parent | 27ceab924f8b354f1f4f4901e688000401e6adec [diff] |
Merge "resolve merge conflicts of 148db9dfa669 to oc-mr1-dev" into oc-mr1-dev