tree 9f54dd98ef53c7968bd90952a20f289ffa486d6d
parent 22444f041e6fe9c74593d69613a657cd91d36a26
parent aa63bc391ee059f612da417991ea01030101a46d
author The Android Open Source Project <initial-contribution@android.com> 1238342106 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1238342106 -0700

Merge branch 'open_source_no_contributions' into google_internal