OSDN Git Service

Merge "Fix build break from merge conflict" am: c13fbeb220 am: dfd6e355c9
authorMathieu Chartier <mathieuc@google.com>
Wed, 5 Oct 2016 01:01:32 +0000 (01:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Oct 2016 01:01:32 +0000 (01:01 +0000)
commit32b4c75b7c9e36a58c5a91ddf0c8e15d283134e2
treeddbaa7d3527fb5ad7177023cca9ccbe9ba88c554
parentd06a009b669ef4ac30d22617d3aace9f511c7f5f
parent9d2b9cb0e8ffb70be2415d0d1c69763934309cf4
Merge "Fix build break from merge conflict" am: c13fbeb220 am: dfd6e355c9
am: 9d2b9cb0e8

Change-Id: Iccbf744b226ce67194c6dc7afa42e09e44e3e7a4