OSDN Git Service

Merge branch 'master' of git://android.git.kernel.org/platform/development into merge...
authorJean-Baptiste Queru <jbq@google.com>
Thu, 9 Jul 2009 18:24:20 +0000 (11:24 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 9 Jul 2009 18:24:20 +0000 (11:24 -0700)
commit91bc70bfa66f5ab6915d3b706014de773226f534
tree0dbfd8f9ecc851a14ce82c456c0af9567201cdf3
parent5c25cfa4ffd7aeb3b34e600b36069cece434d08b
parent70b7e21f9f766be694e816b261813ba28a1bbdf1
Merge branch 'master' of git://android.git./platform/development into merge_korg_master

* 'master' of git://android.git.kernel.org/platform/development:
  Value for windows condition is missing a dot before "exe". "adbexe" should be "adb.exe"
  Add the FixedGridLayout sample code.
  Fix NullPointer exception in function getBrokenAvds()