tree fce90c057e25ba5415d96625a3af0f852b30e715
parent 18b9eafd39b0e87829cdbf34d53135eb4ce4636f
parent ddcc5bca5e94580692bcd5fb9f7509cde019285b
author Xavier Ducrohet <> 1240116210 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1240116210 -0700

Merge branch 'readonly-p4-master'