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

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

2013-09-17 15:44:48 -07:00

..

java

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

2013-09-17 15:44:48 -07:00

jni

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

2013-09-16 10:45:01 -07:00

res

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

2013-09-17 13:52:26 -07:00

tests

am bac2fcac: am 326f4505: Merge "Update the Connectivity Manager test suit to use InstrumentationTestCase." into klp-dev

2013-09-16 14:19:18 -07:00