OSDN Git Service

resolve merge conflicts of 8fa3d44 to nyc-mr1-dev
authorpkanwar <pkanwar@google.com>
Sat, 7 May 2016 05:30:06 +0000 (05:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 7 May 2016 05:30:06 +0000 (05:30 +0000)
commit86f77ab1e2287f0221d35aef445592815d8d54ce
treeee5e866e09319488341cefb3dbbecbc353cacd85
parente53389309a2a8baa00d6835d51318f103a132930
parent3d4a586b80f6862f3f2452e07afad13f7b380133
resolve merge conflicts of 8fa3d44 to nyc-mr1-dev
am: 3d4a586b80

* commit '3d4a586b80f6862f3f2452e07afad13f7b380133':

Change-Id: I36f8df9761b48a87bd3c3a255fc5182d141c6172