tree 787cb1dec076fe6d70facd95eabff929ac8ae420
parent 634ff545252b9f92e50171a28bacf2a21e50f1ae
parent 7351908e6944610c1098891809b715fb7ef03b2d
author Jean-Michel Trivi <> 1239745304 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1239745304 -0700

Merge branch 'readonly-p4-master'