OSDN Git Service

resolve merge conflicts of 4058a71 to stage-aosp-master am: 538ed261eb
authorTao Bao <tbao@google.com>
Mon, 11 Jul 2016 16:20:15 +0000 (16:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jul 2016 16:20:15 +0000 (16:20 +0000)
commit6bd0909da94087401960c1840726dd8ffb9d06b7
tree04f3e8f628e392762ad3697ca6e3c1182a72bd6d
parentdd312c93087333190ec6321b0abc3cedebff2788
parent4a673770cb099a2f710d96e52a0c96777e9c4f6a
resolve merge conflicts of 4058a71 to stage-aosp-master am: 538ed261eb
am: 4a673770cb

Change-Id: Ibb07dea374703ad2098f1c3744fde0b21a54ed3d