| commit | 0423f030642f78d0e107b3c43b75b0ff11fc2e3e | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Thu Jan 16 17:14:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 16 17:14:37 2014 +0000 |
| tree | ae4e78df94d492c37733e381cbcae39432b0b69b | |
| parent | 52cf96e9aa650ff50a0a25924e81bec35be56c4f [diff] | |
| parent | 28c9c34d8670266add371e9f0f33e4da52a024f4 [diff] |
am 28c9c34d: am 6d2d58de: Merge "Fixed asset_manager.h, rect_manager.h, and jni.h" * commit '28c9c34d8670266add371e9f0f33e4da52a024f4': Fixed asset_manager.h, rect_manager.h, and jni.h