tree d66ce5a2234839de7f58d7d3611f3e4c209e0aa6
parent c6b097a06775cfcb7defcaefbea424b9651ababb
parent 67436bf1a195bc7b5ad4e6f3e7fbf5f5d889642e
author The Android Open Source Project <initial-contribution@android.com> 1363798006 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1363798006 +0000

am 67436bf1: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '67436bf1a195bc7b5ad4e6f3e7fbf5f5d889642e':