diff options
author | Scott Main <smain@google.com> | 2010-05-18 09:07:39 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-18 09:07:39 -0700 |
commit | 8473259ddb693e4c41e8ec4313466351ff5b92f7 (patch) | |
tree | e57a15f28ad10ddacefdbbd83f83c3b531a374b4 /core/config | |
parent | d633215b60cc9a8c64cca8d6e7f6af6dfd0fbfb1 (diff) | |
parent | 74e151c54c31cf7324771fcabc06e9fbfe1118ca (diff) | |
download | frameworks_base-8473259ddb693e4c41e8ec4313466351ff5b92f7.zip frameworks_base-8473259ddb693e4c41e8ec4313466351ff5b92f7.tar.gz frameworks_base-8473259ddb693e4c41e8ec4313466351ff5b92f7.tar.bz2 |
am 74e151c5: am 5f1d1002: Merge "docs: fix markup error" into froyo
Merge commit '74e151c54c31cf7324771fcabc06e9fbfe1118ca' into kraken
* commit '74e151c54c31cf7324771fcabc06e9fbfe1118ca':
docs: fix markup error
Diffstat (limited to 'core/config')
0 files changed, 0 insertions, 0 deletions