OSDN Git Service

Merge "Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d...
authorPawin Vongmasa <pawin@google.com>
Fri, 19 Aug 2016 17:05:11 +0000 (17:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Aug 2016 17:05:11 +0000 (17:05 +0000)
commita25f2f5359d21418c7825cec9a2b6f6f62c7c3b4
tree746a5b2eda73b2207f4632c10ab0ce350f5df976
parentb65f47d30ab56058e23752f0146f359b72bfb9d5
parent06985c1dbc541db61e3fe7e6e82f5387681a4917
Merge "Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d." into lmp-dev am: 7a66bd2404 am: c776d9b42f
am: 06985c1dbc

Change-Id: I3265aee42b89b18cdc3be5d374e25897f15be208