| commit | 700539bef58a05be6ef88f5fe2802b2bc5e24787 | [log] [tgz] |
|---|---|---|
| author | Chenbo Feng <fengc@google.com> | Tue Jul 18 08:33:10 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 18 08:33:10 2017 +0000 |
| tree | c20d722a140cf87655c039e435e58037a1d6641b | |
| parent | ff54e7910cd979f40512496c3656511e6284cf34 [diff] | |
| parent | b67b237853c31ca5262a30e6b3d8e77d7a36a130 [diff] |
Merge "resolve merge conflicts of 921e4b7e1c to oc-dev" into oc-dev am: f33518ff9d Change-Id: I055c066bcaaa004800db28d401fda54174ac5756