Narayan Kamath f70afa9b8f am 721d0994: am f60b2d40: am 024191b5: Merge "Fix comment. It should be \'or\' not \'of\'." ...

* commit '721d0994dc6ed370e359a33a6798f87389a428c8':
  Fix comment.  It should be 'or' not 'of'.

2015-01-06 20:09:06 +00:00

..

java

Merge "Allow use of theme attributes in color state lists"

2015-01-06 18:47:29 +00:00

jni

am 721d0994: am f60b2d40: am 024191b5: Merge "Fix comment. It should be \'or\' not \'of\'."

2015-01-06 20:09:06 +00:00

res

Merge "Allow use of theme attributes in color state lists"

2015-01-06 18:47:29 +00:00

tests

am 93241de7: Merge "Remove a bitrotted test." automerge: ba6982a

2014-12-18 02:42:27 +00:00