tree ead74d8318633c6ed8adaafff91e130f16f9eb93
parent aee801f692172b8d377d16f3c837f02babc6e9f2
parent a376f22c700423e1143385d8e61341674fbf4c64
author The Android Open Source Project <initial-contribution@android.com> 1349195066 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349195066 -0700

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

* commit 'a376f22c700423e1143385d8e61341674fbf4c64':