tree 193291f87e7c69ddcfbed1703b58903f59440c69
parent a02244e097ee05a6842cdf489155fb72aa3c7183
parent 9faa9e6a7df9a5b9ef7c8e9d5c07d2a050c319d3
author Andy McFadden <> 1239176223 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1239176223 -0700

Merge branch 'readonly-p4-master'