OSDN Git Service

am 801fd314: am c1d449d0: (-s ours) Fix http://b/2305223 (DO NOT MERGE)
authorDaniel Sandler <dsandler@google.com>
Fri, 4 Dec 2009 20:25:43 +0000 (12:25 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Dec 2009 20:25:43 +0000 (12:25 -0800)
commita5db0f5f3540ed93caa816a854646b67a81cc28d
tree0acb15eb8fb3d6315207b556f9a0ab35f78742f7
parent9b8b540e33514fd99604e8265fd311187be3ddf0
parent801fd314c77c1e03c34a5172377202d3e28bd4c9
am 801fd314: am c1d449d0: (-s ours) Fix b/2305223 (DO NOT MERGE)

Merge commit '801fd314c77c1e03c34a5172377202d3e28bd4c9' into eclair-mr2-plus-aosp

* commit '801fd314c77c1e03c34a5172377202d3e28bd4c9':
  Fix http://b/2305223 (DO NOT MERGE)