tree 937b5143bcf4674971da51e6f813c2b441576357
parent f258f41baa8e6515fbac610c5adbac1a0fbeaef0
parent 376462b7de0bd86c47bd26727aa49e8fa5ddb24d
author Nick Kralevich <nnk@google.com> 1369077040 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369077040 -0700

am 376462b7: am c89d97c9: Add exceptions.

* commit '376462b7de0bd86c47bd26727aa49e8fa5ddb24d':
  Add exceptions.