summaryrefslogtreecommitdiffstats
path: root/core/config
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-05-18 09:02:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-18 09:02:09 -0700
commit74e151c54c31cf7324771fcabc06e9fbfe1118ca (patch)
treed7d56c79c2ec252aeb488495482157e96bddafaf /core/config
parentfbb285e67f6b150440647d0c484d88edb7bf9be9 (diff)
parent5f1d100298dfafbd996b6deff457e6d1de4008a0 (diff)
downloadframeworks_base-74e151c54c31cf7324771fcabc06e9fbfe1118ca.zip
frameworks_base-74e151c54c31cf7324771fcabc06e9fbfe1118ca.tar.gz
frameworks_base-74e151c54c31cf7324771fcabc06e9fbfe1118ca.tar.bz2
am 5f1d1002: Merge "docs: fix markup error" into froyo
Merge commit '5f1d100298dfafbd996b6deff457e6d1de4008a0' into froyo-plus-aosp * commit '5f1d100298dfafbd996b6deff457e6d1de4008a0': docs: fix markup error
Diffstat (limited to 'core/config')
0 files changed, 0 insertions, 0 deletions