diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-06-03 20:53:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-03 20:53:49 +0000 |
| commit | 76364c6970f86bdf67622c14c9f1ebac6883998b (patch) | |
| tree | c19465374a69d9f1fe7260d6a184eb3a60ee941f /rs/java/android/renderscript/RenderScript.java | |
| parent | 236b71649ce008578cf77557033df322e93a1e17 (diff) | |
| parent | d0f215756aa3767db8a73ece7fe9f401256dd263 (diff) | |
am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit 'd0f215756aa3767db8a73ece7fe9f401256dd263':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions