OSDN Git Service

resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev am: eb35ad9969
authorAndrew Scull <ascull@google.com>
Fri, 13 Jan 2017 17:54:22 +0000 (17:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jan 2017 17:54:22 +0000 (17:54 +0000)
commit9af145dcc43e26e12ac41a5f705a28eff6f13089
tree6f87b631da805bfbf6194bda56c4cb5dfa27b222
parent88002e8e386c682b0ea7561a5cff7ff5549b963c
parent3aac3ebee1079ba56afde5d149b0653c891cb5a8
resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev am: eb35ad9969
am: 3aac3ebee1

Change-Id: Idf677426c40799b17d08e0a8ac7dfafc2f2609b2