tree 760ac0a5611bf380034da1c5209b67ccca6a8376
parent bf6823b468eecd83d1d71ff6bf9a21c6a87e9ad8
parent b448af348deb61f8acf89613cde345b140ea6170
author Xavier Ducrohet <> 1240346198 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1240346198 -0700

Merge branch 'readonly-p4-donut' into donut