OSDN Git Service

am 137858b4: resolved conflicts for merge of 5284bcff to gingerbread-plus-aosp
authorDavid 'Digit' Turner <digit@google.com>
Thu, 14 Jul 2011 16:18:29 +0000 (09:18 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 14 Jul 2011 16:18:29 +0000 (09:18 -0700)
commit6c190fd326099d8315e194b0ad0a173e21146e14
tree2046748a94bb5ce6eae4710cefe6dde848ee4aa8
parent273d3549198d144331f3e502eeb1215417d72b16
parent137858b43b7e0ed46fb8ebce9230eb40f0a62432
am 137858b4: resolved conflicts for merge of 5284bcff to gingerbread-plus-aosp

* commit '137858b43b7e0ed46fb8ebce9230eb40f0a62432':
  Avoid array overrun. We can now mount the /sdcard partition on our boot sdcards