tree d4dfb140e7326ff48721db7c63a2c841e393f015
parent 1df281a0379495631c7d7149968c3110142f994c
parent 6974cb62299bfa95ebda7dbc1c7c081bb6820c64
author Scott Barta <sbarta@google.com> 1364327218 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364327218 -0700

am 6974cb62: Merge "Updates the assetstuio library."

* commit '6974cb62299bfa95ebda7dbc1c7c081bb6820c64':
  Updates the assetstuio library.