diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-06-03 20:57:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-03 20:57:43 +0000 |
| commit | 6eff9e54ebcc9d416ba008a0106708240f3abf9b (patch) | |
| tree | f2cec723d1d2ebf0a9e5b3cf02ba2a29685b19be /rs/java/android/renderscript/RenderScript.java | |
| parent | d76ac50187226d08937235b441a142164576533a (diff) | |
| parent | 728e72df9ded3ad4b007b0c615aec6d03ab0b789 (diff) | |
am 728e72df: am 2bc3df2e: am b97ac2b6: am c8414f11: (-s ours) am 4dcb4a1f: am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '728e72df9ded3ad4b007b0c615aec6d03ab0b789':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions