commit | cba9291560815b5d713392e916902dfd0ad91eed | [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 | 2de34eaf949bd30904e7e7343a64fce86fec4561 | |
parent | 48f8e8741950f2b4e069dbbd25452182effb275a [diff] | |
parent | 0b270d3d0e20021bfab17bfc0e2c0710ad2e612d [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