am a2ef514b: am 83bd985e: am 470ec2be: am 0423f030: am 28c9c34d: am 6d2d58de: Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"

* commit 'a2ef514b62a4035e08001413938e0ba03be64d25':
This commit is contained in:
Andrew Hsieh
2014-05-13 15:17:50 +00:00
committed by Android Git Automerger

Diff Content Not Available