tree 8aee67862c16b1a9bf0f8dd41016291d4c1eb1cf
parent e3dd0191a5d70866763b00b3f70ebc8a77626594
parent fd4037d219ba5e5cfa8fb6ebe19dd6d375d94ed5
author The Android Open Source Project <initial-contribution@android.com> 1343772370 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343772370 -0700

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

* commit 'fd4037d219ba5e5cfa8fb6ebe19dd6d375d94ed5':