| commit | 7c6c8f47c86ad300d9d52febbb1d296f84c429c1 | [log] [tgz] |
|---|---|---|
| author | Zhuoyao Zhang <zhuoyao@google.com> | Wed Jul 26 19:38:22 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jul 26 19:38:22 2017 +0000 |
| tree | b4c14f92386c93eb59f629cfec4be86abdae6a5c | |
| parent | 9ff0bb218bd7c6fbb5a638808287b36773ad4f3e [diff] | |
| parent | a27606b6406b87981c13e71e354d0a1223cd035c [diff] |
Merge "resolve merge conflicts of 8d92561 to oc-mr1-dev" into oc-mr1-dev