tree a7897811528a4d8a8644c0abbf9bba5db41a8cfc
parent 96c27559b070f5966560b78fcebe1ffa7038e87a
parent d86e6ddfc18833178f5d560ed3c4dc235d12d4c2
author Lorenzo Colitti <> 1239736226 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1239736226 -0700

Merge branch 'readonly-p4-master'