tree efe57cc1c6a87e562585fa5e263e57d06fa05346
parent f671fb0e627567ffc49ed766263fde53d23552fd
parent a2dd1440e36bb7955f71dc898e25553cb52dc93d
author Xavier Ducrohet <> 1240356246 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1240356246 -0700

Merge branch 'readonly-p4-donut' into donut