am 5db1f5aa: Merge "Fix Java API error where requesting another style for a provided family fails" into klp-dev
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

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base