am a53c21ed: fix broken build bug:3095237
authorVasu Nori <vnori@google.com>
Thu, 14 Oct 2010 05:53:40 +0000 (22:53 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 14 Oct 2010 05:53:40 +0000 (22:53 -0700)
commit3e759e21291d6ca1a49ded3f24f3be0a26af4e2b
tree5a6a6b2f549ebb0fe5d33a4923a25e1236915ed1
parent57c4e9180e3a339dba984f1c8dff76ef18443a7a
parenta53c21edb5dc57d97dcddd03fbfa2022abf43787
am a53c21ed: fix broken build  bug:3095237

Merge commit 'a53c21edb5dc57d97dcddd03fbfa2022abf43787' into gingerbread-plus-aosp

* commit 'a53c21edb5dc57d97dcddd03fbfa2022abf43787':
  fix broken build  bug:3095237