tree 590b3129e29790b02a942ab84045526fbdcb238a
parent 0a1b202e697d2fd52879235d7fb3fbf1b9c1fabb
parent 2c5316f58ad68d858e7726128521429fc8bb4a86
author Romain Guy <> 1239312121 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1239312121 -0700

Merge branch 'readonly-p4-master'