tree c5236d8dea49b85c5c46be3f639a5532eee5a93c
parent 79282c867b79376e5d6217589a2cc4371d59fff9
parent 8ad72ec1cb517a54d1e0f3a7206b119d59fabc19
author Dirk Dougherty <> 1240432635 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1240432635 -0700

Merge branch 'readonly-p4-donut' into donut