tree 52610baba474df56aca468336f7da3b89a91b645
parent 976a70c41ec0dd6f283c1bec8b2c0c15deb373c0
parent 2e939805afafebced02bc3ed027807291ddd5dc4
author The Android Open Source Project <initial-contribution@android.com> 1352734111 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352734111 -0800

am 2e939805: Reconcile with jb-mr1-release - do not merge

* commit '2e939805afafebced02bc3ed027807291ddd5dc4':
  JOP40C
  JOP40B