| commit | e251b587b79117491b356e12b632caa87cf13edd | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Wed Oct 04 13:39:38 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Oct 04 13:39:38 2017 +0000 |
| tree | 65d8f26eacdbe5433f75a145f5c444d2e9debab1 | |
| parent | 7b9c789d23ae88e665ebff600e7636741168eef0 [diff] | |
| parent | a79e01b62e68818e0a0e0324dd1e2773c0ad4acd [diff] |
Merge "resolve merge conflicts of 3765bf9bd to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp