OSDN Git Service

Merge "Fix build." into mnc-dev
authorDianne Hackborn <hackbod@google.com>
Wed, 15 Jul 2015 18:59:18 +0000 (18:59 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 15 Jul 2015 18:59:20 +0000 (18:59 +0000)
commitd193916c83015d54466ad998fb9373f15da754a7
treebac4c4701e86e1f073a21297c4ee40b4de65bcb1
parent76c4c6668a1486bc003ab0c585bb1f41d16e27a7
parenta503b62b1597ba6f5fcff537cecbe2dad1d088f7
Merge "Fix build." into mnc-dev