OSDN Git Service

am f5b5482d: Merge "Fix build breakage"
authorChris Craik <ccraik@google.com>
Wed, 29 Jan 2014 23:35:59 +0000 (15:35 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Jan 2014 23:35:59 +0000 (15:35 -0800)
commit4fac179d2efe12bc49223f79ff6680db847c3ab5
tree01fdaeb59c2b6fcd53b19cfaa46431f52ae89f56
parentfb7949141b1423b2dd8eb3692b2dab53d79c7d5d
parentf5b5482dcab2a87beacc36b25fe54cfec8923714
am f5b5482d: Merge "Fix build breakage"

* commit 'f5b5482dcab2a87beacc36b25fe54cfec8923714':
  Fix build breakage