am 8cda99f2: am a25c9b28: Remove unused type attribute.
am 8cda99f2: am a25c9b28: Remove unused type attribute.

Merge commit '8cda99f292050048fb7e1f8077f5f9c0022a9c1a'

* commit '8cda99f292050048fb7e1f8077f5f9c0022a9c1a':
  Remove unused type attribute.

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