tree b46997ded357ee2f9af5be093cf2103d8346dd11
parent 90a8e6f62720e7767c9246972c63a950b9dd1c63
parent 911b8f36c1bca4a185be59827c618ac84d83ad00
author Qiwen Zhao <zhao@google.com> 1379009077 -0700
committer Qiwen Zhao <zhao@google.com> 1379009077 -0700

Merge uiautomator/ from platform/frameworks/testing to /