am 92da1779: Merge "Fix bug in Scene\'s use of setTag" into klp-dev
am 92da1779: Merge "Fix bug in Scene\'s use of setTag" into klp-dev

* commit '92da1779a932aed9c6ce32c117d0334f8d6a7273':
  Fix bug in Scene's use of setTag

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