OSDN Git Service

am 3e01b483: (-s ours) am 843c6e25: merge "SDK: stub the maps.jar from the google_api...
authorRaphael <raphael@google.com>
Fri, 4 Feb 2011 23:20:36 +0000 (15:20 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Feb 2011 23:20:36 +0000 (15:20 -0800)
commit77c1e67b876b0d486d0056e418889117d8093093
tree05de3fc138880bcfd455049dbf1f6672a8de63dd
parent053f5491340f5bacddd9943521c8f1b1d0c0bb6a
parent3e01b483708d0fc3766fa4adff2ae8b354de75dc
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.