Dianne Hackborn f65951bf5d am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 ...

* commit '0dd9ec144b0da8df9d8900d78c8177e761de458d':
  Make ResolverActivity update dynamically.

2012-03-02 08:33:22 -08:00

..

java

am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1

2012-03-02 08:33:22 -08:00

jni

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

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

res

Mark configuration strings as not translatable.

2012-02-29 13:19:58 -08:00

tests

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

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