OSDN Git Service

am 3463d0e1: (-s ours) resolved conflicts for merge of c1b33081 to gingerbread-plus...
authorJean-Baptiste Queru <jbq@google.com>
Wed, 15 Dec 2010 00:15:12 +0000 (16:15 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Dec 2010 00:15:12 +0000 (16:15 -0800)
commit282d39123949ca76ac96af79bdfb29407b723d02
tree1d9c459a2f33e6e56933842882ff353325fa7ce5
parent02e172e892190c1c94539594d639776c4b24efdf
parent3463d0e1026263d9d740c3324138a346b0c9006d
am 3463d0e1: (-s ours) resolved conflicts for merge of c1b33081 to gingerbread-plus-aosp - DO NOT MERGE

* commit '3463d0e1026263d9d740c3324138a346b0c9006d':
  (DO NOT MERGE) Issue #3255640: Need to bump GB to API 10 version name "2.4"