OSDN Git Service

Merge \"resolve merge conflicts of 07fe016 to nyc-dev\" into nyc-dev
authorAndrew Solovay <asolovay@google.com>
Thu, 28 Jul 2016 00:04:49 +0000 (00:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Jul 2016 00:04:49 +0000 (00:04 +0000)
commit64e4e6e549fa1f9e100b35559e3630251baae8cc
tree985451352eb3abc55b8d68f6c16a19e6e793079c
parent238ea71c512c842fd68eba6300099f9610155b86
parented49ee64f0bc1cf2fe4207494546cca49b0bfc8b
Merge \"resolve merge conflicts of 07fe016 to nyc-dev\" into nyc-dev
am: ed49ee64f0

Change-Id: I691154858f4d776786e115f82ea5310524beba6f