OSDN Git Service

Merge "resolve merge conflicts of b9d34b3 to master"
authorFan Zhang <zhfan@google.com>
Fri, 15 Jul 2016 23:06:24 +0000 (23:06 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 15 Jul 2016 23:06:25 +0000 (23:06 +0000)
commita519938250d3c50ddf36d872571304631e61a7ed
tree1dc4a0848ce5783c56df528c382044f500fb95b6
parentea70d8d0d0de13379a7ea9d9b7148bfac3e75942
parentf04fe0489f7e6e16ef628559739f63b5d25674e6
Merge "resolve merge conflicts of b9d34b3 to master"