Adam Powell 4900f13ee4 am 7be7d86c: am 5ded30c9: Merge "Asset import from ux-assets" into klp-dev ...

* commit '7be7d86ce9d15ab94ace2e69fc192c226ad18a3b':
  Asset import from ux-assets

2013-09-24 15:43:58 -07:00

..

java

am 9b7d1484: am 5f86b90b: Merge "Fix issue #10848916: "Always" button is not working." into klp-dev

2013-09-24 14:51:06 -07:00

jni

am fad41c8f: am 5db1f5aa: Merge "Fix Java API error where requesting another style for a provided family fails" into klp-dev

2013-09-24 10:22:29 -07:00

res

am 7be7d86c: am 5ded30c9: Merge "Asset import from ux-assets" into klp-dev

2013-09-24 15:43:58 -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