tree bd364a8972f5c0d149039bf5daaaee879e030cbd
parent fe0f6b73ab3863169afe1a21e9885d07589e99ef
parent 4394c9b06057e798c30bf4b250a59ed3b6519aca
author Raphael Moll <> 1240259119 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1240259119 -0700

Merge branch 'readonly-p4-master'