Merge commit 'e6ca35d4b0adf8bff8ea8fbc68eb9da16e7f4689' into eclair-plus-aosp * commit 'e6ca35d4b0adf8bff8ea8fbc68eb9da16e7f4689': Fix ResourceQualifier tests.
Merge commit 'e6ca35d4b0adf8bff8ea8fbc68eb9da16e7f4689' into eclair-plus-aosp * commit 'e6ca35d4b0adf8bff8ea8fbc68eb9da16e7f4689': Fix ResourceQualifier tests.