commit | a129d4434f7a698bfb1977f254b084340589468f | [log] [tgz] |
---|---|---|
author | Bart Sears <bsears@google.com> | Tue Mar 29 13:23:55 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 29 13:23:55 2011 -0700 |
tree | 54764d9883129c005433151be8d41c0e2949f767 | |
parent | b8f4d6d9979f87742cdd543b50a2b83d2cbac053 [diff] | |
parent | 5116244797b4996b3a58e88866cb8d45169c6e13 [diff] |
am 7cad54cb: (-s ours) am 35137d66: (-s ours) am 6a19759c: Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread * commit '7cad54cb8283b67e5d4106112772dc038b7dbb40': Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread