OSDN Git Service

resolve merge conflicts of b34cf86 to nyc-dev-plus-aosp
author宋凯伦 <songkailun@xiaomi.com>
Mon, 13 Jun 2016 20:10:42 +0000 (20:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 13 Jun 2016 20:10:42 +0000 (20:10 +0000)
commit69118dc9b1c64c0e5b30fd14274dffbff099113c
tree1c1d4ea69d081eb150d37d0ce21cc48afe9d6419
parentfe91143d71205ba5efe73de69d3415ba2bbfc1d1
parent89b8babe6a7af2afbfebed80f57c1d7f39886f3d
resolve merge conflicts of b34cf86 to nyc-dev-plus-aosp
am: 89b8babe6a

Change-Id: I5918f6a061ab0d5f3d81b99174d5517cd44e389c