OSDN Git Service

Merge \\"resolve merge conflicts of 07fe016 to nyc-dev\\" into nyc-dev am: ed49ee64f0
authorAndrew Solovay <asolovay@google.com>
Thu, 28 Jul 2016 01:16:46 +0000 (01:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Jul 2016 01:16:46 +0000 (01:16 +0000)
commitf0ca1c16d773161fb6ccebf1e38d41c0814247bc
treed2ba70e1e3c79f825240103d7ef211cbc36d932f
parentc03ee73ec2b3364309d9a11538f8ee616d5f1232
parent52d5b382ee801184be615d6c17644e1f569b34fb
Merge \\"resolve merge conflicts of 07fe016 to nyc-dev\\" into nyc-dev am: ed49ee64f0
am: 52d5b382ee

Change-Id: I2b3796399eaab85a519b016a069d2f7d606d288b