Kenny Root b5a14f0fc9 resolved conflicts for merge of 1995a7de to master ...

Change-Id: I9915ae06d460696b24cbee935738267911baa580

2013-09-18 14:23:58 -07:00

..

java

resolved conflicts for merge of 1995a7de to master

2013-09-18 14:23:58 -07:00

jni

am 2e4e9889: am 3490228e: Merge "Use a native buffer for decoding images." into klp-dev

2013-09-18 10:58:27 -07:00

res

am faebc647: am bd49a1da: Merge "Change case of "keyset" to "keySet" for manifests" into klp-dev

2013-09-18 13:18:33 -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