Gilles Debunne 71eaac0880 am 95464c9a: am 445ab76c: Merge "Broken build. Missing ;" into gingerbread ...

Merge commit '95464c9aa063d2e36a0385a60edd6ee519ed2d85'

* commit '95464c9aa063d2e36a0385a60edd6ee519ed2d85':
  Broken build. Missing ;

2010-08-27 16:18:37 -07:00

..

config

…

java

am 2479097e: am b94493fe: Merge "Document blocking behavior of ImageView setImageURI and setImageResource" into gingerbread

2010-08-27 16:18:24 -07:00

jni

am 95464c9a: am 445ab76c: Merge "Broken build. Missing ;" into gingerbread

2010-08-27 16:18:37 -07:00

res

Merge "Added default map boundaries for locale rm-CH. Cloned from values-de-rCH/arrays.xml."

2010-08-27 14:37:19 -07:00

tests

am aed5d62a: am 8f5007ba: am 163fba0a: Merge "Improve logging and flexibility of BT stress tests." into froyo

2010-08-27 15:52:33 -07:00