tree 313a09a2e640a348c68de091e6c923b50a372016
parent 2fd5e06fabe4488bbfdf9d0e7470fac0d6c12f01
parent 0078570ca1323ea418306a70d091f8694de5ac9b
author Michael Jurka <mikejurka@google.com> 1335474295 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335474295 -0700

am 0078570c: Merge "Removing crosshairs" into jb-dev

* commit '0078570ca1323ea418306a70d091f8694de5ac9b':
  Removing crosshairs