tree 22a1e8e323bbf5d5f1158cdfbbbccf983bfab980
parent 359c8ecbf78e696dcb1cf5855c2d3e0e89db43a1
parent 82ac685f6565141fdaed76d7bb50c86b1385f58a
author Xavier Ducrohet <> 1240250614 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1240250614 -0700

Merge branch 'readonly-p4-master'