tree 313a09a2e640a348c68de091e6c923b50a372016
parent a742856872c4e4a2fd3d9a91457dedae6cc0eab1
parent af9504dc00a1e8060567854c2428f8a00d949693
author Michael Jurka <mikejurka@google.com> 1335474067 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1335474067 -0700

Merge "Removing crosshairs" into jb-dev