tree cdfbc6ff3811450a537bd1b824d6f96245f9b266
parent cbd39727a94729285a5ba88f9af31a7b7309bd0b
parent a02777e5c2b75dabd1269f1f3feac46e5f29663f
author Andy McFadden <> 1239038293 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1239038293 -0700

Merge branch 'readonly-p4-master'