tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 8b948583df41db73add7bb1892d4e50beea41eb2
parent 468be9612483e62074fa462f8bf87bc9d38bfa3d
author Michael Jurka <mikejurka@google.com> 1392411551 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411551 +0000

am 468be961: am 1ed9a397: am 6789f458: am d58000b0: am 39511301: Fix crash in crop view

* commit '468be9612483e62074fa462f8bf87bc9d38bfa3d':