tree ca4a31ade84d57016078ef208187575b8f1eb676
parent 16a98c0959f2381c537502bd0596557a9e38bf13
parent 03fbe40d5346eb4d5258aa55a00a9a7cb18f8551
author Joe Onorato <> 1239636747 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1239636747 -0700

Merge branch 'readonly-p4-donut' into donut