OSDN Git Service

Merge changes I8953967a,If17eddad into oc-dev
authorJason Monk <jmonk@google.com>
Thu, 20 Apr 2017 17:31:42 +0000 (17:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Apr 2017 17:31:42 +0000 (17:31 +0000)
commit68da249054cdfa157cd883e07f375c60c843773d
tree50fe2c20b10def441e4e3ca8c13f08c3d4f8bf67
parent0ed1bf8e4df8ce7091548fc347b88950c8f4cec3
parentb8abd8d8677838a145d613bf0439f84947f804e0
Merge changes I8953967a,If17eddad into oc-dev
am: b8abd8d867

Change-Id: I9d2462aa708a67d4a9fe4d5cde477b9f14e8d204