diff options
| author | Irfan Sheriff <isheriff@android.com> | 2013-02-15 15:55:43 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-15 15:55:43 -0800 |
| commit | 05913cc97915f04d0c75ce6a39282628570e90ff (patch) | |
| tree | 50c6fe03cd0c244cc1c8923f4ba337a8ff5ef630 /graphics/java/android/renderscript/RenderScript.java | |
| parent | 5fce0c1fe3352ae7c69dc67be1ff84425e11455a (diff) | |
| parent | c6ea41efc93df12eeef7c59124bee83e8f3f7a41 (diff) | |
am c6ea41ef: Merge changes I8c5649c9,I79b43bf7,I83a01690,If5687eac,Ib9fd57c6,I7104250e
* commit 'c6ea41efc93df12eeef7c59124bee83e8f3f7a41':
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