commit | dbf68aa372078f4f55a267e1eb182dd360384467 | [log] [tgz] |
---|---|---|
author | Robert Greenwalt <robdroid@android.com> | Mon Dec 07 15:36:25 2009 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 07 15:36:25 2009 -0800 |
tree | 82532532c7c3191e618990374525c0353f287eaa | |
parent | 1fbc280dac0ce5089ff1491612944344af8d72b4 [diff] | |
parent | 54a4a66d38eff838d6d1fb3d0ede203aceb750c3 [diff] |
am 54a4a66d: am 9ae9763b: (-s ours) Merge change Ib097fbbf into eclair Merge commit '54a4a66d38eff838d6d1fb3d0ede203aceb750c3' into eclair-mr2-plus-aosp * commit '54a4a66d38eff838d6d1fb3d0ede203aceb750c3': DO NOT MERGE Reverting change I53e91db7.