tree c3c3d35ebb06e219bf41460f70c98ebd6ee828d3
parent 44df5c8692d37e2d5e729b52b908e1a49df83a84
parent d0d4d44d344779e59ee196637bbc745d68d70677
author The Android Open Source Project <initial-contribution@android.com> 1349887539 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349887539 -0700

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

* commit 'd0d4d44d344779e59ee196637bbc745d68d70677':