tree b98e9ac8f46afb73da848d01570050398377b5bd
parent c695c28f158f1527ea0476094aea41067840f8f5
parent bd98fec2ab633eb81102b3424ba258b24876e887
author The Android Open Source Project <initial-contribution@android.com> 1349450454 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349450454 -0700

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

* commit 'bd98fec2ab633eb81102b3424ba258b24876e887':