OSDN Git Service

resolve merge conflicts of 07fe016 to nyc-dev am: 0f9a790e0f
authorAndrew Solovay <asolovay@google.com>
Thu, 28 Jul 2016 01:16:42 +0000 (01:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Jul 2016 01:16:42 +0000 (01:16 +0000)
commitc03ee73ec2b3364309d9a11538f8ee616d5f1232
treed2ba70e1e3c79f825240103d7ef211cbc36d932f
parent3d75f7fd97896c1ea23a8ab32c980c435989ecdb
parent19747cb135124e3875bef35f9b6bfa4861f6f550
resolve merge conflicts of 07fe016 to nyc-dev am: 0f9a790e0f
am: 19747cb135

Change-Id: I5144e51821212bd099dd59cb9f341692522121b1