am 783f14dd: am 3326f804: Fix the last remaining gaps in our Java 6 API.
am 783f14dd: am 3326f804: Fix the last remaining gaps in our Java 6 API.

Merge commit '783f14ddc9e4032b72aed7880aeb9d39970c98b7'

* commit '783f14ddc9e4032b72aed7880aeb9d39970c98b7':
  Fix the last remaining gaps in our Java 6 API.

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