tree 10da860fcff71886af91d082e31f0e1917926848
parent 197d6578a1c0a97a86d37692198433e283d04dcd
parent f66a44213992ea0a038fd9d9f7c49f21973c6b51
author Michael Jurka <mikejurka@google.com> 1414566207 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566207 +0000

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

* commit 'f66a44213992ea0a038fd9d9f7c49f21973c6b51':