diff options
| author | Scott Main <smain@google.com> | 2010-11-10 14:55:48 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-10 14:55:48 -0800 |
| commit | d4b5d85e2cbf8fb7150a0b0030132e28d7e4d9e2 (patch) | |
| tree | 967cbf8c3a1bdeb005a4f3b16225c49504682d4c /libs/rs/rsg_ScriptJavaClass.cpp | |
| parent | d6c7893d663aa74840bb491ddbce500bc0752ac5 (diff) | |
| parent | 77f5c9542e159cb9f2f2908227212d4add8ce74c (diff) | |
am 77f5c954: resolved conflicts for merge of 5a726729 to gingerbread
* commit '77f5c9542e159cb9f2f2908227212d4add8ce74c':
docs: remove "new" tags from sample apps
Diffstat (limited to 'libs/rs/rsg_ScriptJavaClass.cpp')
0 files changed, 0 insertions, 0 deletions