tree 580733f2b38a95cc57c0716d7014eaf7ad652e35
parent 2ad33d01a9de1d5988e623d2e6632e23374a3343
parent bc0caf802e5eb08b6565bbe3a535cb2fca826d8b
author Jean-Michel Trivi <> 1240249651 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1240249651 -0700

Merge branch 'readonly-p4-donut' into donut