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)
commitf87c76d0dcb0a7cff97f6fccc286acf33bb29316
treec2d5ce9925eeace20fbff2fcd6ef4cba0aec1ef8
parent127d900ccc90bc946bd9d2e25a8914aa0059dee1
parent6c81dfeaefefdf3e3f143b37968f4f2e90591f27
Merge changes I328ea51d,I577c5d02
am: 6c81dfeaef

Change-Id: I18b7d076b1db11560f4ee4488a5c4f5f8093ffa5