tree c155533a66a651d248cbfca8009deaf802b33a09
parent bddae03fbd7931fc7894a5139e6dcc35abfcc005
parent 3946a2b75b36cbdd1ac4d67d16dafdbabc8d2055
author Jean-Michel Trivi <> 1240120777 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1240120777 -0700

Merge branch 'readonly-p4-master'