tree cba62d0d64153aa2169651696bc238591341d679
parent 786e37cf5e95dddbf4efe997b5c81abcbb9e8919
parent 468be9612483e62074fa462f8bf87bc9d38bfa3d
author Michael Jurka <mikejurka@google.com> 1414085284 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085284 +0000

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

* commit '468be9612483e62074fa462f8bf87bc9d38bfa3d':