OSDN Git Service

Merge "Revert "resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev"" into oc-mr1-dev
authorMatthew Fritze <mfritze@google.com>
Tue, 1 Aug 2017 01:01:35 +0000 (01:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 1 Aug 2017 01:01:35 +0000 (01:01 +0000)
commit8c0d24cb6d343f7a6c60bb1152fe191525cbdaf2
treef84c54c37676e669f3fd88469af27d39c87ab63f
parent61c338ee9a3d7a1e4b071b2ca323a637dfbcbb6d
parent21b22f01548751131504ce035c9e713b3ec55943
Merge "Revert "resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev"" into oc-mr1-dev
am: 21b22f0154

Change-Id: I9f203d14386598c0cb9c3264350564d75280e9a7