OSDN Git Service

Merge changes I710ca0ed,I576e7926,Id0144b68
authorAndreas Gampe <agampe@google.com>
Thu, 17 Nov 2016 21:11:18 +0000 (21:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Nov 2016 21:11:18 +0000 (21:11 +0000)
am: de19542bdd

Change-Id: Idae7cdaadfbe28263d5862d4e3d87ecb4d68d247


Trivial merge