OSDN Git Service

Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am:...
authorPaul Stewart <pstew@google.com>
Wed, 20 Jul 2016 03:36:30 +0000 (03:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Jul 2016 03:36:30 +0000 (03:36 +0000)
am: e6a1f3beef

Change-Id: I086e25935cd799bce96971a3b6ccaaed1713a5e9


Trivial merge