tree 0a3865de924cd6c242c47716581910100f9a3dba
parent 937bf99bdf42c8ca3add95af57e3693ee48975c0
parent b72a4718fca6b1ccde71c785cea317f5b3c2c2e9
author Urs Grob <> 1240305161 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1240305161 -0700

Merge branch 'readonly-p4-master'