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

Merge commit '3326f8043858152ea2a407a9a4c20fdcdc859e73' into gingerbread-plus-aosp

* commit '3326f8043858152ea2a407a9a4c20fdcdc859e73':
  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