tree aaface30d4f71264beb77b0f3e3f4e6356a61508
parent 4982a9b8654f9e6d864623be1580527319fe93a9
parent 2ea2e8212627ea4c678c7ff8e222918f60a03c9a
author Jorg Pleumann <> 1239129270 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1239129270 -0700

Merge branch 'readonly-p4-master'