OSDN Git Service

Merge changes I328ea51d,I577c5d02
authorRichard Uhler <ruhler@google.com>
Wed, 20 Jul 2016 18:28:17 +0000 (18:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Jul 2016 18:28:17 +0000 (18:28 +0000)
am: 6c81dfeaef

Change-Id: I18b7d076b1db11560f4ee4488a5c4f5f8093ffa5


Trivial merge