tree cd124eff0fc6d5141d1d206fb508aa42a82ac1b9
parent d5ebb7b06d4ba5674735463b3fe26d8fa9dcd896
parent 796901d3b0b70f09c51b877ae76e98bf0cf2b82a
author Doug Zongker <> 1238692409 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1238692409 -0700

Merge branch 'readonly-p4-master'