tree 0fec73a222870527ac189afeca2cbfba8be41aa3
parent fa0330cc701d8cff6b2d35cf154478f5dc9c909a
parent 138a04170d964da9cdec228e95b976875ae52481
author Karl Rosaen <> 1240538497 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1240538497 -0700

Merge branch 'readonly-p4-donut' into donut