tree 3f599805d03f5f0590c53071e8908ce3c18069ee
parent 554bd8937b60e8f015f1f46b939dff92c2259790
parent 977c4a5b81317cdf6537e58f82a5edcd0641ca50
author Mathieu Chartier <mathieuc@google.com> 1408578596 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408578596 +0000

am 977c4a5b: Merge "Clean up ExceptionOccurred."

* commit '977c4a5b81317cdf6537e58f82a5edcd0641ca50':
  Clean up ExceptionOccurred.