am 5e6889cb: am 8009752d: Merge "fix android beam demo path" into ics-mr0
am 5e6889cb: am 8009752d: Merge "fix android beam demo path" into ics-mr0

* commit '5e6889cb1c10da98f6a104670aa57715df3af65e':
  fix android beam demo path

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