tree 05de3fc138880bcfd455049dbf1f6672a8de63dd
parent 053f5491340f5bacddd9943521c8f1b1d0c0bb6a
parent 3e01b483708d0fc3766fa4adff2ae8b354de75dc
author Raphael <raphael@google.com> 1296861636 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296861636 -0800

am 3e01b483: (-s ours) am 843c6e25: merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.

* commit '3e01b483708d0fc3766fa4adff2ae8b354de75dc':
  merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.