am 47e39a9f: am 88724657: Merge "Fix bug #7148393 Switch can crash when hierarchyviewer is connected" into jb-mr1-dev
am 47e39a9f: am 88724657: Merge "Fix bug #7148393 Switch can crash when hierarchyviewer is connected" into jb-mr1-dev

* commit '47e39a9f61ae5ffdcb912c1f6196dd6f8e7478b5':
  Fix bug #7148393 Switch can crash when hierarchyviewer is connected

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