commit | 36b0b85abd20b4f4bea210060dec3fbe80870dd5 | [log] [tgz] |
---|---|---|
author | Jason Chen <jasonchen@google.com> | Wed Feb 23 18:08:23 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 23 18:08:23 2011 -0800 |
tree | 101ae9208fa8c4e9a0b704cec6807a95e1152552 | |
parent | 6588c7cf73a9d09cad1fa5d4e558a55a5e5e18df [diff] | |
parent | 22577b8d3a39c1373594ba3e4427212eee4cd6d4 [diff] |
am 22577b8d: (-s ours) am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread * commit '22577b8d3a39c1373594ba3e4427212eee4cd6d4': DO NOT MERGE Cherry-pick of Ie4026a7c back to GB