OSDN Git Service

Merge "Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d...
authorPawin Vongmasa <pawin@google.com>
Fri, 19 Aug 2016 16:57:05 +0000 (16:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Aug 2016 16:57:05 +0000 (16:57 +0000)
commitc776d9b42ff411028f3dd7e93e0ba7b6578d735e
treef975899e45ea74b0c2d5b8ab0164bc02a593129b
parent0aaa2c606c3e2db24068e0742576e9ea7d1be7b8
parent7a66bd2404f2b171f8cb28a8ef7a3c2e6176a2a4
Merge "Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d." into lmp-dev
am: 7a66bd2404

Change-Id: Ia6fabe0d3bcedf9834f3a7dfb8b2a6c19e4f0d80