| commit | ef9144e82ea3366597c5ad5c9a4c22caaf899a02 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Tue Jun 06 19:11:58 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 06 19:11:58 2017 +0000 |
| tree | bb54d9734b4a2eb2243e3ec58ea1c759bc6dce4e | |
| parent | 5174d76f132a21f7365c3a8bbf707e8e1ac18f2d [diff] | |
| parent | 9d02ca813fb73c878bef7dd706e6f2cd1e4564c8 [diff] |
resolve merge conflicts of 4bc9219d to oc-dev-plus-aosp am: 9d02ca813f Change-Id: Ib99bfeadc267769a70fe978e651df3236f4a01b8