OSDN Git Service

DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636e...
authorPawin Vongmasa <pawin@google.com>
Fri, 19 Aug 2016 17:07:04 +0000 (17:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Aug 2016 17:07:04 +0000 (17:07 +0000)
commit45cd2f896bd647d54e96585400e927c6a46742ae
treef975899e45ea74b0c2d5b8ab0164bc02a593129b
parentc776d9b42ff411028f3dd7e93e0ba7b6578d735e
parent83cf293b73ed9ddff3162b75083f6a75dd07b7f2
DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: ad929db743 am: 453ba68c65 am: 2a21f09fff  -s ours
am: 83cf293b73  -s ours

Change-Id: I92bb3e0101da80205105f1d047eea56f5c5d85a0