diff options
| author | Irfan Sheriff <isheriff@android.com> | 2013-02-15 16:18:50 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-15 16:18:50 -0800 |
| commit | b21a30dbc28fd5fc25ae89fbae7542d77546da50 (patch) | |
| tree | 65394461734ad752e1b12b716514f6ba25aa3797 /graphics/java/android/renderscript/RenderScript.java | |
| parent | 7c93839d7b41727c11925b034d4ec84491d3dee1 (diff) | |
| parent | 05913cc97915f04d0c75ce6a39282628570e90ff (diff) | |
am 05913cc9: (-s ours) am c6ea41ef: Merge changes I8c5649c9,I79b43bf7,I83a01690,If5687eac,Ib9fd57c6,I7104250e
* commit '05913cc97915f04d0c75ce6a39282628570e90ff':
Fix broken test.
Track keys per config and allow cert push from apps
eix enterprise config storage bugs
Fix connectivitymanagertest
Fix build
Refactor enterprise config
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions