tree 68fa9e6e4e8cd7f3f686510d4dc11afaf434e462
parent 74338867aa4247ce0feba7abfe260e65c3b264c2
parent 6fb5a1d0ee18b2d94340f3b35f86ad7319f3a11c
author Jean-Michel Trivi <> 1240270295 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1240270295 -0700

Merge branch 'readonly-p4-donut' into donut