commit | 3e115b81a46b849a2b556f5f1202a56bf4884619 | [log] [tgz] |
---|---|---|
author | Ying Wang <wangying@google.com> | Wed Sep 01 17:01:06 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 01 17:01:06 2010 -0700 |
tree | c90d3a848663402c9d77db36088aeb09fa236095 | |
parent | 37d58711f63052137e79b4fa319480299de535a6 [diff] | |
parent | 17b44ee3d82d7b8efa8dc3bc17d78fee11d72e01 [diff] |
am 17b44ee3: (-s ours) am 21f0f97e: Fix for crespo. Merge commit '17b44ee3d82d7b8efa8dc3bc17d78fee11d72e01' * commit '17b44ee3d82d7b8efa8dc3bc17d78fee11d72e01': Fix for crespo.