tree 3ed3a4f6b18a5ae47f55ab4b124a6104ac670b3c
parent d377572797492ee0d87876a37fa0065b5d3626a1
parent a3103f9fe060e91fd6de0975ebe31ddeed88a9e4
author The Android Open Source Project <initial-contribution@android.com> 1348507126 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348507126 -0700

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

* commit 'a3103f9fe060e91fd6de0975ebe31ddeed88a9e4':