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

Merge branch 'readonly-p4-donut' into donut