tree 32656abdc2c69614288b77e912b494acc073579b
parent 762d30a31365e5cae9ba7c2802de60a2f8c3513d
parent f0bc7ecebf8c30732f6de109b9e04dab253c3d08
author The Android Open Source Project <initial-contribution@android.com> 1238560465 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1238560465 -0700

Merge commit 'goog/readonly-p4-master'