tree 370b1ffd1687f2ad6e2e986461781cbc32eeca39
parent a76ded711209190003542c1752c15d1fa445abbf
parent 1c53e61689094f088a07b6fb3cb634eda1833f05
author David Turner <digit@android.com> 1305729720 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305729720 -0700

am 1c53e616: am fd6ed4dd: Merge "adding functionality to get the local name of an object from it\'s local name"

* commit '1c53e61689094f088a07b6fb3cb634eda1833f05':
  adding functionality to get the local name of an object from it's local name