summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-06-21 11:58:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-21 11:58:19 -0700
commitbcc9536aeb5831b481723470cab3564401c58d39 (patch)
tree3f7f5191582c8b703dbf2076123810dc626b740a
parentad0530957219093c19abbc736f5636a3292b07c7 (diff)
parent2154560baa276b9cb683b671d126464a4731d37e (diff)
downloaduiautomator-bcc9536aeb5831b481723470cab3564401c58d39.tar.gz
am 4dc84014: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '4dc84014d0ff9bbdab05c683228f6c51d5fa218a':
0 files changed, 0 insertions, 0 deletions