tree 00bc33ca53d5027c3408336afb1a95f8788904d9
parent b1cccefdb7ae4afe31332b1264311f52f9f9c48c
parent 8094a1462ddcff10bc19baf46b337f1d49c88a25
author Dirk Dougherty <> 1240386472 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1240386472 -0700

Merge branch 'readonly-p4-master'