OSDN Git Service

Merge changes I295c7876,Ib4b84b7b am: 84413a7617 am: 7aee171992
authorAndreas Gampe <agampe@google.com>
Fri, 22 Jul 2016 00:11:11 +0000 (00:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Jul 2016 00:11:11 +0000 (00:11 +0000)
am: 3ec5be2608

Change-Id: Ie826b8f7de8087b68658d2a69dbcd911d0824987


Trivial merge