tree 55ca91c11e9bb07344d7f229c5818aa3871967d4
parent 2f3af06189990ea58041c5d6857209d40d361d8e
parent 3a9691afed5e97aae8ca54139b1f3998c28ee16f
author Eric Fischer <> 1239175912 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1239175912 -0700

Merge branch 'readonly-p4-master'