| commit | 39fea6b6dcb3c1ba46364c153ca482a9f5f8e235 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Fri May 05 10:22:53 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri May 05 10:22:58 2017 +0000 |
| tree | f1d7e2cb9fcf729a4594e1aa09436724c2069135 | |
| parent | 0883dd5e14ecb7b5b3f8c8d57d93c950ab5886be [diff] | |
| parent | b0818e8871eb157ee6a6991ea27a6082dc084741 [diff] |
Merge "resolve merge conflicts of c2421a2a3c37 to oc-dev-plus-aosp" into oc-dev-plus-aosp