OSDN Git Service

am 5786f5cf: Merge "Fix build." into ics-mr1
authorDianne Hackborn <hackbod@google.com>
Sat, 25 Feb 2012 00:24:40 +0000 (16:24 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 25 Feb 2012 00:24:40 +0000 (16:24 -0800)
commit126004dade1328bc6df08d9b0cccf964cc392331
tree0ecbd0769f339854cca023a8cf56e75f0ba5aa63
parent7a519dfe475181895606707370eeedee2ac7b0df
parent49b0cca8999336f55dbac789a939a3a64a740229
am 5786f5cf: Merge "Fix build." into ics-mr1

* commit '5786f5cf1b248b79f938b3fa3c5d534159261f09':
  Fix build.