Justin Ho 46a41ced32 am 972d12aa: Merge "DO NOT MERGE Revert "Increase line limit for summary text"" into ics-mr1 ...

* commit '972d12aa1e6fba69094c0a9270df645b7db74f3a':
  DO NOT MERGE Revert "Increase line limit for summary text"

2012-03-19 08:11:16 -07:00

..

java

am eb1d42e4: Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1

2012-03-15 15:56:12 -07:00

jni

am 472512f6: Merge "Fix incorrect prototype for JNI call"

2012-02-13 19:55:52 -08:00

res

DO NOT MERGE Revert "Increase line limit for summary text"

2012-03-17 17:09:35 -07:00

tests

extend timeout to allow for more time for the device to connect.

2012-03-01 12:28:14 -08:00