tree 399caeadf65829ab47ce15a4bbc215727b7748be
parent 21f776d65cf20611585f7895b3163e685a9d2bcd
parent f666888a786fd1775827977515e0c1994f996d58
author Eric Fischer <> 1238804762 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1238804762 -0700

Merge branch 'readonly-p4-master'