OSDN Git Service

am 64f6d1f2: am 358c03ff: reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 22:20:15 +0000 (14:20 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Feb 2010 22:20:15 +0000 (14:20 -0800)
commite65672b7c7bd6fd371bfc58536ae97a519717caf
treefc3b65596998042273d41b172cf0ea9ca63455c9
parent3475b8a74bf3d1e94688604326d5dd0f6d441852
parent64f6d1f2ee0563cb8cffaf3ceeeab7393538cf31
am 64f6d1f2: am 358c03ff: reconcile main tree with open-source eclair

Merge commit '64f6d1f2ee0563cb8cffaf3ceeeab7393538cf31'

* commit '64f6d1f2ee0563cb8cffaf3ceeeab7393538cf31':
  android-2.1_r1 snapshot