tree 63f1f5b579f71c9aa3fe949ac0e89a596d21c8d1
parent 2ec6c5699181316e5a5c2cd293c006ac4a8bb101
author Fred Quintana <fredq@google.com> 1260403240 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1260470638 -0800

am 563bfade: fix a build breakage

Merge commit '563bfade6601f3410681b3cd8b069ed22af5b048' into eclair-mr2-plus-aosp

* commit '563bfade6601f3410681b3cd8b069ed22af5b048':
  fix a build breakage