OSDN Git Service

Merge "resolve merge conflicts of 8c1e6e49f95b to oc-dev-plus-aosp" into oc-dev-plus...
authorJason Monk <jmonk@google.com>
Thu, 15 Jun 2017 20:06:14 +0000 (20:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 15 Jun 2017 20:06:14 +0000 (20:06 +0000)
commit4aa97fc104783c75eff4b0f5af14b4d57f781445
tree26382579981fba42ea967dd982dfda0ae92147a1
parent1b492769a5641880f90e00caa220dea32c3755a8
parent57f58037b4c25471fae8fb4fb01bb6ce34e9f2dc
Merge "resolve merge conflicts of 8c1e6e49f95b to oc-dev-plus-aosp" into oc-dev-plus-aosp am: 797fdc4450
am: 57f58037b4

Change-Id: I51089e75c8a508cbbd39d8949b3e660fa6a16b14