| commit | 28c9c34d8670266add371e9f0f33e4da52a024f4 | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Thu Jan 16 09:09:56 2014 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 16 09:09:56 2014 -0800 |
| tree | 254c997ff540c61a893a1fb795b36770c8f50df0 | |
| parent | 1c9e736166ee6d00962360d1a41a840862346562 [diff] | |
| parent | 6d2d58de54169cd2cae9dbf3f69bd52af87daae5 [diff] |
am 6d2d58de: Merge "Fixed asset_manager.h, rect_manager.h, and jni.h" * commit '6d2d58de54169cd2cae9dbf3f69bd52af87daae5': Fixed asset_manager.h, rect_manager.h, and jni.h