tree bf0f47848a330918eece8f756ab9cf51eb687f4c
parent 0ac90af35b6db35770bbb6e5c95d880994f4cf63
parent af528e0d33cb13e868e6f6e951297564432e1c90
author The Android Open Source Project <initial-contribution@android.com> 1349887681 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349887681 -0700

am af528e0d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'af528e0d33cb13e868e6f6e951297564432e1c90':