| commit | cbfbd85c8e6fa426fef0ed943f117c47babc8dfa | [log] [tgz] |
|---|---|---|
| author | Jiyong Park <jiyong@google.com> | Tue Jun 27 08:07:13 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 27 08:07:15 2017 +0000 |
| tree | e19e6222d9a864e2ade615605387d41ef44758d7 | |
| parent | 1f9e5b0710bd6d26d2c0dd7634a700b24b9f4a91 [diff] | |
| parent | bffa875d78e9ed203aec3e308fcb4cf86582f3f9 [diff] |
Merge "resolve merge conflicts of 40da4609e to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp