| commit | 0e4d38028ce64b923136149a9245cf3ee7fabedb | [log] [tgz] |
|---|---|---|
| author | Robin Lee <rgl@google.com> | Thu Mar 30 17:31:05 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Mar 30 17:31:05 2017 +0000 |
| tree | 9fae880aae612c14a0d6111c8544a271b54e41a0 | |
| parent | d0e473a9bb578e64cad61f63847300df035cff2a [diff] | |
| parent | 1f3f5955bb627f418379fd2d6fb02e03fb2768ce [diff] |
Merge "resolve merge conflicts of 943187668c44 to oc-dev-plus-aosp" into oc-dev-plus-aosp am: 1f3f5955bb Change-Id: Iab71657e2f95658aa4b87beb273cd65b473d6871