OSDN Git Service

resolve merge conflicts of 07fe016 to nyc-dev
authorAndrew Solovay <asolovay@google.com>
Thu, 28 Jul 2016 00:04:43 +0000 (00:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Jul 2016 00:04:43 +0000 (00:04 +0000)
commit238ea71c512c842fd68eba6300099f9610155b86
tree985451352eb3abc55b8d68f6c16a19e6e793079c
parent3c733da11e997f8c4b9cdfd03ee0812c3b51a76b
parent0f9a790e0ff141aa4c1adb3954801fed4a164315
resolve merge conflicts of 07fe016 to nyc-dev
am: 0f9a790e0f

Change-Id: Ib2c80caff9cd1cde788ed00bf64afff8862d981b