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