OSDN Git Service

Merge "resolve merge conflicts of 012144f to nyc-dev am: bb9a8d8eb8 am: f46b7b2d77...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 24 Jun 2016 03:44:20 +0000 (03:44 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 24 Jun 2016 03:44:20 +0000 (03:44 +0000)
commit7b368daac65a8c6ec5131ae2a26a599ba80ce66b
tree5de1514a7ac831d7ed043630a024466302b6fe39
parent6fb6aa51a47ab0cb8bcbc3ab21ba68742229b2a5
parentabbe361456704e3cfbbfb850ff32616bd564d828
Merge "resolve merge conflicts of 012144f to nyc-dev am: bb9a8d8eb8 am: f46b7b2d77" into nyc-mr1-dev-plus-aosp