OSDN Git Service

Merge changes Id25696e4,I939a12a2 into klp-dev
authorPaul Stewart <pstew@google.com>
Wed, 20 Jul 2016 00:17:49 +0000 (00:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Jul 2016 00:17:49 +0000 (00:17 +0000)
am: 77b5526229

Change-Id: I07fc88a342c3c6d1594832d0a05dd0734eb48424


Trivial merge