commit | 044f323e624084de464e780828f1d7f204e4d01d | [log] [tgz] |
---|---|---|
author | Adam Lesinski <adamlesinski@google.com> | Tue Nov 11 19:53:44 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 11 19:53:44 2014 +0000 |
tree | 2771290242b9f5e88cc83d8fbf621b5f7339d123 | |
parent | 7b1c33f7a498b954d4c098e9f1a367b2be395d83 [diff] | |
parent | 24c16b7e4cdbacedd33347a01ff4944abfc86218 [diff] |
am 24c16b7e: Merge "Frameworks/base: Fix AssetManager JNI" * commit '24c16b7e4cdbacedd33347a01ff4944abfc86218': Frameworks/base: Fix AssetManager JNI