tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 0d80b33097c0e495d36e0eb6f04a51d57ff48309
parent 6789f4585ab0cd60736c9ea7f0142246a16e1e82
author Michael Jurka <mikejurka@google.com> 1392410175 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410175 +0000

am 6789f458: am d58000b0: am 39511301: Fix crash in crop view

* commit '6789f4585ab0cd60736c9ea7f0142246a16e1e82':