commit | 79d91784d15dce8391b5a572590e0d13b0873b6e | [log] [tgz] |
---|---|---|
author | Deepanshu Gupta <deepanshu@google.com> | Thu Sep 04 02:49:21 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 04 02:49:21 2014 +0000 |
tree | c273500ee8a3b0878c4183c804e7ec4555d3beb1 | |
parent | 67f835876469b60958860a2a4413aeb2c7d40d64 [diff] | |
parent | 81cd0d8d52f83bf3cc6193dead8aa6486d23bdc0 [diff] |
am 81cd0d8d: (-s ours) am a780eee4: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-modular-dev * commit '81cd0d8d52f83bf3cc6193dead8aa6486d23bdc0': Resolve color xml attributes properly. [DO NOT MERGE]