tree e7233361343deb70f75be81b8cd3a1e2a13404e7
parent 18fbac3edb21cc9111b3fdea12fa2c62695d2f19
parent 373e615d325c2bde095360e29dd6341acbf75de9
author Urs Grob <> 1239333676 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1239333676 -0700

Merge branch 'readonly-p4-master'