OSDN Git Service

am 22577b8d: (-s ours) am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c...
authorJason Chen <jasonchen@google.com>
Thu, 24 Feb 2011 02:08:23 +0000 (18:08 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 24 Feb 2011 02:08:23 +0000 (18:08 -0800)
commitcba9291560815b5d713392e916902dfd0ad91eed
tree2de34eaf949bd30904e7e7343a64fce86fec4561
parent48f8e8741950f2b4e069dbbd25452182effb275a
parent0b270d3d0e20021bfab17bfc0e2c0710ad2e612d
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