tree b31345015ab1c06d9936e46af90e37ad85518529
parent 1d89d71c2e716c7a60c23f34b2d70118d32a22f6
parent 153c3f2e0a47222a58da7a7fe9fb32e405a8373b
author Dmitry Shmidt <> 1240246450 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1240246450 -0700

Merge branch 'readonly-p4-master'