tree 628d1cf2c8b15cc71dd29a730a0de12e14edcd8d
parent ea0e4c54efeb30aa03aa04cef1d2172f9e7adafb
parent cf1cd90d0abbfd771fbc675d2d70fd789fa13c71
author Eric Fischer <> 1239175911 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1239175911 -0700

Merge branch 'readonly-p4-master'