Tsu Chiang Chuang 9dfb0c6c65 am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1 ...

* commit '08eb7dd630a2de8dd51a988a747da26ff9d3f8fb':
  extending timeout to stabilize tests

2012-02-13 13:43:34 -08:00

..

java

am 52bfc243: docs: fix misc doc bugs from external issue tracker

2012-02-09 12:48:18 -08:00

jni

am 2ddf6ea6: Merge "Fix issue with selecting proper JNI libraries" into ics-mr1

2012-01-13 13:12:41 -08:00

res

am 197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1

2012-02-10 15:14:06 -08:00

tests

am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1

2012-02-13 13:43:34 -08:00