| commit | 27a13aba1b865c032c5091e7c1fe23034faf9f48 | [log] [tgz] |
|---|---|---|
| author | Kazuhiro Inaba <kinaba@google.com> | Tue Jul 11 04:33:22 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 11 04:33:22 2017 +0000 |
| tree | 16d4b7e8debfe714638f020dd5d3dae036f120c4 | |
| parent | 8b0251832ba6c04cb83095db6c5487f576dc1ea3 [diff] | |
| parent | 18ee096a2902e3ae312102d1c23b0400d852ce7d [diff] |
Merge "Merge "resolve merge conflicts of dbad963d0f to oc-dev am: 345f72f99a" into oc-dev-plus-aosp am: 0211c20c70" into oc-dr1-dev-plus-aosp am: 18ee096a29 Change-Id: I5bb6a9ccd7acf6a4114782f94e953b3000ce15ad