tree a67430e8a2ed78026f73bea27fd5d08e78ea3111
parent c7a654f3fa22ada2f4bc02ea314117af3d24e98c
parent bd2a7126e5b42e022228c6aac25e95b671e5263b
author Mike Lockwood <> 1238740962 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1238740962 -0700

Merge branch 'readonly-p4-master'