tree cbe2d70cba8a4ec3152837e4fc69799ae54a2635
parent 004c5c01c7d0c0c6e2d199fb4de86c67f91015a5
parent 78aebd860157a972b4a5c7b67435676f4361021f
author Jason Sams <rjsams@android.com> 1253194855 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1253194855 -0700

am 78aebd86: Use rs support for object loading.

Merge commit '78aebd860157a972b4a5c7b67435676f4361021f'

* commit '78aebd860157a972b4a5c7b67435676f4361021f':
  Use rs support for object loading.