Merge heads

This commit is contained in:
youtaol
2012-06-05 16:51:53 +08:00
parent 953bd8b908
commit 04cc524bbb
131 changed files with 4865 additions and 692 deletions
-1
View File
@@ -20,7 +20,6 @@ limitations under the License.
<color name="gray">#FFAAAAAA</color>
<color name="red">#FFFF0000</color>
<color name="transparent">#00000000</color>
<color name="white">#FFFFFFFF</color>
<!-- holo_orange_dark -->
<color name="warning_background">#FFFF8800</color>