| commit | 09176abe67323b350542c826b5b6ed56087fc872 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Fri Jan 13 14:16:21 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 13 14:16:21 2012 -0800 |
| tree | f0ad19f38c538cb2b1d76cb8fdf6719cfec638da | |
| parent | 3ee8dfd1786a2c57bc0ab648f7f9f11e4719c8cf [diff] | |
| parent | fcbbaf1d837e96e77d0ec45a050e8a41060ae7f3 [diff] |
am fcbbaf1d: resolved conflicts for merge of e80341c8 to master * commit 'fcbbaf1d837e96e77d0ec45a050e8a41060ae7f3': Fix issue with selecting proper JNI libraries