OSDN Git Service

resolve merge conflicts of 07fe016 to nyc-dev am: 0f9a790e0f am: 19747cb135
authorAndrew Solovay <asolovay@google.com>
Thu, 28 Jul 2016 01:50:33 +0000 (01:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Jul 2016 01:50:33 +0000 (01:50 +0000)
commit3f6143764655ef171de37cded2b984ee5648df5b
tree33ca1ee2992e14d6e085b397fe3db1b1ef1f142f
parenta7a1038b4e2f9f8ac1f16f9850c21edc317defc1
parentc03ee73ec2b3364309d9a11538f8ee616d5f1232
resolve merge conflicts of 07fe016 to nyc-dev am: 0f9a790e0f am: 19747cb135
am: c03ee73ec2

Change-Id: Ife1195c5dba328b5bf31876364aa75008e5fcb31