diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-07-12 17:42:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-12 17:42:33 -0700 |
| commit | 6ba9e6fbef64da3dacb66e2833ce847e94694d7e (patch) | |
| tree | 3b48a9e8daa2523ea95e44d95d671d46b0827e30 /graphics/java/android/renderscript/ProgramStore.java | |
| parent | 7b1a2079227cd93d1d92088fed0df2351705cbe4 (diff) | |
| parent | 5a93032dcbe54223e03102d497d7e04370491737 (diff) | |
am 5a93032d: doc change: resolved conflicts for merge of 3c691a8d to gingerbread
Merge commit '5a93032dcbe54223e03102d497d7e04370491737' into gingerbread-plus-aosp
* commit '5a93032dcbe54223e03102d497d7e04370491737':
Doc change: add notes for ndk r4b.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions