OSDN Git Service

Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-modular-dev
authorDongwon Kang <dwkang@google.com>
Wed, 16 Aug 2017 00:05:57 +0000 (00:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 16 Aug 2017 00:05:57 +0000 (00:05 +0000)
am: 47da6c0b7e

Change-Id: Ic636c904d8dd4f7b329e2571f336aabf4f2a0079


Trivial merge