OSDN Git Service

resolve merge conflicts of 95e42d9 to nyc-dev-plus-aosp
authorDavid Gross <dgross@google.com>
Thu, 21 Jul 2016 21:56:11 +0000 (21:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jul 2016 21:56:11 +0000 (21:56 +0000)
commit619fa2673f284168555201ee27f5364e0c3dcd15
tree97aac50feade4a082c0e07a173ca41d54ffbb118
parent7b82ec394b2ba10f6fb83906b1acbdeb724dc9cd
parent289688de68d93e16cd04a00614d424cbe1482a99
resolve merge conflicts of 95e42d9 to nyc-dev-plus-aosp
am: 289688de68

Change-Id: I652da37413ea880c902cc6ff2a40526f481da9dc