tree 848215b7a99366aba1896b2e7bc2357f97ac00c9
parent 5e9014424d2567d14a8c8301866dbb7762b4f7ff
parent 49de886719b27d646c50a5171172bf0865387380
author The Android Open Source Project <initial-contribution@android.com> 1354066458 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354066458 -0800

am 49de8867: (-s ours) am 365ce897: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '49de886719b27d646c50a5171172bf0865387380':