tree b6e09f854feb332cc1b90451a43dd18611a84e67
parent a35df3487b7571b216cb991ae8b47dab2c16ce43
parent 3e294b91a0b21f7191690dd7bbc382c52cc6cb3c
author Niko Catania <> 1238737168 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1238737168 -0700

Merge branch 'readonly-p4-master'