commit | 144a2883cb2dfc38aadf7d167e7bcb70408107f7 | [log] [tgz] |
---|---|---|
author | Nick Kralevich <nnk@google.com> | Fri Apr 29 15:11:19 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 29 15:11:19 2011 -0700 |
tree | 22c6d082821b80c21005fafcec84b4620c86e7bf | |
parent | d2e3607f49b51fa7a8493dcb53ac7c807848cbc7 [diff] | |
parent | f0f955e2c3440d835bfffffdec31c980d9a1ffd9 [diff] |
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
diff --git a/docs/html/guide/topics/resources/providing-resources.jd b/docs/html/guide/topics/resources/providing-resources.jd index 10d25bb..2a551e9 100644 --- a/docs/html/guide/topics/resources/providing-resources.jd +++ b/docs/html/guide/topics/resources/providing-resources.jd
@@ -264,8 +264,8 @@ names.</p> <table> <tr> - <th>Qualifier</th> - <th>Values</th> + <th>Configuration</th> + <th>Qualifier Values</th> <th>Description</th> </tr> <tr id="MccQualifier">