OSDN Git Service

Merge "Fix build breakage"
authorChris Craik <ccraik@google.com>
Wed, 29 Jan 2014 23:32:52 +0000 (23:32 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 29 Jan 2014 23:32:52 +0000 (23:32 +0000)
commitf5b5482dcab2a87beacc36b25fe54cfec8923714
treec1dc0de3c7d57727e4e01a8a8b333549bb16fe94
parentde439dbe2c395a0c61331ffad567af1124782e6b
parent0e7eb954f132d11116bcbafaea4e0e9e1c3c8592
Merge "Fix build breakage"