diff options
| author | Kenny Root <kroot@google.com> | 2013-02-04 17:39:13 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-04 17:39:13 -0800 |
| commit | 791fc1669d14c046fc9a723b847ec8d3af0b1787 (patch) | |
| tree | 31eb947ea19c6f2918472ab02fee7e08406485fb /graphics/java/android/renderscript/RenderScript.java | |
| parent | ebbdbe6488af7aa6de40d44e4c5952fc1381b483 (diff) | |
| parent | 2697f082010c9eb34298dbe7b5c4967d745709d2 (diff) | |
am 2697f082: am 887c5236: am 74637db2: Merge "AndroidKeyStore: return error code on error"
# Via Android Git Automerger (2) and others
* commit '2697f082010c9eb34298dbe7b5c4967d745709d2':
AndroidKeyStore: return error code on error
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions