OSDN Git Service

resolve merge conflicts of fb45739 to nyc-mr1-dev-plus-aosp
authorTao Bao <tbao@google.com>
Fri, 24 Jun 2016 05:56:32 +0000 (05:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 24 Jun 2016 05:56:32 +0000 (05:56 +0000)
am: 377f5944f6

Change-Id: I50110286e3ea25cab3038d64a37b1b5973e20117


Trivial merge