OSDN Git Service

Merge "Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d...
authorPawin Vongmasa <pawin@google.com>
Fri, 19 Aug 2016 17:00:34 +0000 (17:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Aug 2016 17:00:34 +0000 (17:00 +0000)
commit06985c1dbc541db61e3fe7e6e82f5387681a4917
treef975899e45ea74b0c2d5b8ab0164bc02a593129b
parent784c8ac91af958e97a0fcfe24728ccf8cd20dc54
parentc776d9b42ff411028f3dd7e93e0ba7b6578d735e
Merge "Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d." into lmp-dev am: 7a66bd2404
am: c776d9b42f

Change-Id: I202194b9bf1167ab437eb18edd548512e6713bff