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
23 files changed
tree: 17f785129cbd6f6b3dfc80eb47bd89dd1de483d7
  1. .gitignore
  2. Android.mk
  3. MODULE_LICENSE_APACHE2
  4. uiautomator/