tree 36661a63319014a2b364535b25f17859212b3b7a
parent 5d30026ddb1da1de7ec1b9996673f1a444d9241f
parent 0555388b8c1a118f4756d04d73384e55d2ed6602
author Doug Zongker <> 1238691138 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1238691138 -0700

Merge branch 'readonly-p4-master'