tree 33d0f9c5acf403c612c2c8f5b882ddb02d7b8500
parent ef39d2085b630921120ce4ec69d88b62f562e130
parent e9dd491d2295204fa5d4c1ea62e2cc80b80b1a59
author The Android Open Source Project <initial-contribution@android.com> 1366048393 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366048393 -0700

am e9dd491d: Reconcile with jb-mr2-release - do not merge

* commit 'e9dd491d2295204fa5d4c1ea62e2cc80b80b1a59':
  Fix NPE