OSDN Git Service

Merge "Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d...
authorPawin Vongmasa <pawin@google.com>
Fri, 19 Aug 2016 17:10:39 +0000 (17:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Aug 2016 17:10:39 +0000 (17:10 +0000)
commit1f84a02d157cdb468782f128a524384722406ea4
tree51b898ffa728c8790d92bbaf468d536acb130ac0
parent1cdd3c42620555c82320ffc2f25d688448c5cc9a
parenta25f2f5359d21418c7825cec9a2b6f6f62c7c3b4
Merge "Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d." into lmp-dev am: 7a66bd2404 am: c776d9b42f am: 06985c1dbc
am: a25f2f5359

Change-Id: I41c1d70146910fc39926c7fcd1951863f8e967e1