OSDN Git Service

Merge changes I328ea51d,I577c5d02 am: 6c81dfeaef
authorRichard Uhler <ruhler@google.com>
Wed, 20 Jul 2016 18:30:50 +0000 (18:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Jul 2016 18:30:50 +0000 (18:30 +0000)
commit5ff249bfca7a2e3a5b96af9508f2c6a3fcfa189b
treec2d5ce9925eeace20fbff2fcd6ef4cba0aec1ef8
parent415824fa1f48d128271801720a827503032ddb00
parentf87c76d0dcb0a7cff97f6fccc286acf33bb29316
Merge changes I328ea51d,I577c5d02 am: 6c81dfeaef
am: f87c76d0dc

Change-Id: Id44ec9b26970ce22620975cbbdc4fa25204013cf