| commit | 2916ab9bcb188b51f7fecdfb0770213b45afd3c8 | [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 | 1169ce81db02e0b4ea8c84f2c89db3e1a8b6275b [diff] | |
| parent | 2d077c1ebc373ac7438109d6aaff7e0af38e9f22 [diff] |
Merge "resolve merge conflicts of 3765bf9bd to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp