OSDN Git Service

DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636e...
authorPawin Vongmasa <pawin@google.com>
Fri, 19 Aug 2016 17:04:02 +0000 (17:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Aug 2016 17:04:02 +0000 (17:04 +0000)
commit83cf293b73ed9ddff3162b75083f6a75dd07b7f2
treebf221f77d1d659cc669b4a22c56ecf2fd7d6a91e
parent7a66bd2404f2b171f8cb28a8ef7a3c2e6176a2a4
parent2a21f09fff5e80b306ec30a618d54a4827447f3a
DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: ad929db743 am: 453ba68c65
am: 2a21f09fff  -s ours

Change-Id: I540ae20fea8366c44796e104662b505192926270