| commit | b7cc849260a3295d0a1e897868e195cf8eec239e | [log] [tgz] |
|---|---|---|
| author | Sarah Hu <xiaoyinh@google.com> | Sat Apr 15 01:06:20 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Apr 15 01:06:20 2017 +0000 |
| tree | f8b3125e72e18becd08541889378ccaf91adcdfe | |
| parent | b16aee528d8a91981a5e97d4795dd5a3dc8341ff [diff] | |
| parent | 3df6b114b7b83d5c1bab30936cd1c0397d544441 [diff] |
Merge "resolve merge conflicts of 982294a598 to oc-dev" into oc-dev am: 3df6b114b7 Change-Id: I265d2a481db011027e5a11585c23b8691a24ed97