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

* commit '5db1f5aaacf01e176f2463c212da72eaafc79165':
  Fix Java API error where requesting another style for a provided family fails

2013-09-23 18:59:24 -07:00

..

java

am a3abca90: Merge "Issue #10461551: KLP API Review: AppOpsManager" into klp-dev

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

jni

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

2013-09-23 18:59:24 -07:00

res

am b39ce63d: Merge "Offer to enable a print service after it is installed." into klp-dev

2013-09-20 18:18:36 -07:00

tests

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

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