Jeff Sharkey cf4052f6b5 am e48569a8: Merge "Guard against null Context in attachInfo()." into klp-dev ...

* commit 'e48569a87057e46a30d3dcbb2d788a4e4da7f21c':
  Guard against null Context in attachInfo().

2013-09-17 15:40:56 -07:00

..

java

am e48569a8: Merge "Guard against null Context in attachInfo()." into klp-dev

2013-09-17 15:40:56 -07:00

jni

am b693ef60: Merge "Do not allocate so much memory on the stack." into klp-dev

2013-09-16 10:41:40 -07:00

res

am 22d2575c: Merge "Adding more standard media sizes." into klp-dev

2013-09-17 13:49:28 -07:00

tests

Merge "Update the Connectivity Manager test suit to use InstrumentationTestCase." into klp-dev

2013-09-16 21:11:31 +00:00