tree 9f7aed51a2765a672a1fa8862dd56d67ff63f8e9
parent 30fbe72cf708e2cec2489d039735e1ecd43bec36
parent eaa4a626a91759066c707df84607c6ddfc458693
author The Android Open Source Project <initial-contribution@android.com> 1346947895 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346947895 -0700

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

* commit 'eaa4a626a91759066c707df84607c6ddfc458693':