OSDN Git Service

Merge changes I1b74d58b,I38c6e8bc
authorFeng Yu <feny@google.com>
Tue, 13 Sep 2016 15:47:16 +0000 (15:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 15:47:16 +0000 (15:47 +0000)
am: 9f41107732

Change-Id: Ib1a09ccb5773c4f6c01ad1d39b43c6f85f16092d


Trivial merge