tree 540519c31cc685de46496602e7a1f64d4fc5c3c7
parent e8fbb001a43a85feb8e985f48eeb22d4571b63d5
parent 2170312ab0b6766e8b73b806efbe6abdbb702bbc
author Dave Sparks <> 1239936931 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1239936931 -0700

Merge branch 'readonly-p4-donut' into donut