| commit | 4a4a2a676679e80b15b5de27d074cd5d3773cab1 | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Tue Nov 11 19:57:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 11 19:57:20 2014 +0000 |
| tree | be835d38a6819c3b3587db61865adc87f2e57289 | |
| parent | bc0636e5601e8749b7ed31006c24bafad0401af8 [diff] | |
| parent | 044f323e624084de464e780828f1d7f204e4d01d [diff] |
am 044f323e: am 24c16b7e: Merge "Frameworks/base: Fix AssetManager JNI" * commit '044f323e624084de464e780828f1d7f204e4d01d': Frameworks/base: Fix AssetManager JNI