diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-07-26 10:26:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-26 10:26:46 -0700 |
| commit | 7b5b20ef678a7b07946f85370f9654ca7ff11c01 (patch) | |
| tree | 16752f12b55255830f303dec7fd711a318e4950f /graphics/java/android/renderscript/Program.java | |
| parent | 92fba4bc019903f3f37905a0270441e88ccf23a9 (diff) | |
| parent | bd01583d6e936e93141d6b77aec9d8c99684d7a4 (diff) | |
am bd01583d: resolved conflicts for merge of b237bdb6 to gingerbread-plus-aosp
Merge commit 'bd01583d6e936e93141d6b77aec9d8c99684d7a4'
* commit 'bd01583d6e936e93141d6b77aec9d8c99684d7a4':
move native services under services/
Diffstat (limited to 'graphics/java/android/renderscript/Program.java')
0 files changed, 0 insertions, 0 deletions