OSDN Git Service

Merge changes If96c0146,I0d68ad60 into oc-dev
authorSelim Cinek <cinek@google.com>
Fri, 7 Apr 2017 16:08:26 +0000 (16:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Apr 2017 16:08:26 +0000 (16:08 +0000)
commite1fcf8edd66a78f46f7374cfcf7011a353af75ff
tree45e501862156d9636553deaf7178ca8b59221306
parent6fd0d2b37f23cc34cb3602de9000f462f426086c
parent5393a0e2d99f323759d7abc56577e1d3004b51d0
Merge changes If96c0146,I0d68ad60 into oc-dev
am: 5393a0e2d9

Change-Id: Ic70d9eb07b53ccda5fafb8c37177e130d4b279de