tree 17f785129cbd6f6b3dfc80eb47bd89dd1de483d7
parent 467cca7d25dbbf13c14cfd8c2ad38ab8eaf56bda
author Guang Zhu <guangzhu@google.com> 1343688026 -0700
committer Guang Zhu <guangzhu@google.com> 1343756131 -0700

resolved conflicts for merge of 9858df8b to jb-dev-plus-aosp

cherry-picked from AOSP
"""
    removing uiautomatorviewer from frameworks/testing
    It is to be moved into sdk
"""

Change-Id: I8b2fc6bcdceda0705d7e2f337a7dc71c3451c26c