diff options
author | Romain Guy <romainguy@google.com> | 2013-04-12 18:05:48 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-12 18:05:48 -0700 |
commit | 5069101c08ff11e78bfab7eeb7360b0b12e3b54b (patch) | |
tree | d8e328a05cbff67aa58d1d05cc8a63e671f5698f /graphics/java/android/renderscript/RenderScript.java | |
parent | b2d17bc5b4789ce0fc9627ff10a95e22465fb9a6 (diff) | |
parent | 5141bf801e9d58e618c76e4cdc042218b24193fc (diff) |
am 5141bf80: am 80fccb4d: Merge "There should be a mandatory coder\'s license. Bug #8586560" into jb-mr2-dev
* commit '5141bf801e9d58e618c76e4cdc042218b24193fc':
There should be a mandatory coder's license. Bug #8586560
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions