tree 2eb4c424cdfc3c5a8d2118786791279a9f193cb4
parent ad43616ccf46bd1049d8fa679f85681d9bd9b953
parent 8145f84acabfdb74386c4c259faa0efe186982cf
author Clay Murphy <claym@google.com> 1392233002 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392233002 +0000

am 8145f84a: am 047a33dc: am a5e92a1b: Merge "Docs: Add ro.hwui.patch_cache_size ro.zygote.disab Bug: 9258861"

* commit '8145f84acabfdb74386c4c259faa0efe186982cf':