OSDN Git Service

am 35137d66: (-s ours) am 6a19759c: Do Not Merge: Cherry-pick change I7667f9b8 to...
authorBart Sears <bsears@google.com>
Tue, 29 Mar 2011 20:19:07 +0000 (13:19 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 29 Mar 2011 20:19:07 +0000 (13:19 -0700)
commit7cad54cb8283b67e5d4106112772dc038b7dbb40
treed81220182b52788497da14fb7a943cc4f7a2e5aa
parent97621525c54057550dc40b38dcbe03de70cadd87
parent35137d669681a0d6a22316c035ea7c8edc8fdc33
am 35137d66: (-s ours) am 6a19759c: Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread

* commit '35137d669681a0d6a22316c035ea7c8edc8fdc33':
  Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread