am 6901f963: am 93552de8: Merge "stubs"
am 6901f963: am 93552de8: Merge "stubs"

* commit '6901f963c27f2d0a9caf56b42b6054d0cecc84d1':
  stubs

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