| commit | 3f774da57cde803c6e81b6c875c859f076bae636 | [log] [tgz] |
|---|---|---|
| author | Jordan Liu <jminjie@google.com> | Mon Apr 17 22:33:48 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Apr 17 22:33:48 2017 +0000 |
| tree | 931aa9ed472a387d973e2b0feae39d106612e8a1 | |
| parent | f7c7853209c65e6443ea4f87827637b0844933df [diff] | |
| parent | 65c93572b38864dc6fb22ec45a2b8f5f6f112eff [diff] |
resolve merge conflicts of 1b886a1 to oc-dev-plus-aosp am: 65c93572b3 -s ours Change-Id: I444b3ee6a83d8522c44bd2d45ce49f839f51a99c