summaryrefslogtreecommitdiff
path: root/libs/rs/rsObjectBase.cpp
diff options
context:
space:
mode:
author Nick Pelly <npelly@google.com> 2010-10-04 18:27:27 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-04 18:27:27 -0700
commitc7bfb13fd92cda6ae5894ed2ee63e1ab4d7b25ee (patch)
tree033dec00bce4a7fd974ce6435463ff9abc85a2b5 /libs/rs/rsObjectBase.cpp
parente9e9467688d46b9a1b2f5599bab1fe154b2eaf02 (diff)
parent15f107b151deff1f25f1255bdbcb630ed576ac8d (diff)
am 15f107b1: Merge "New API stubs: NdefMessage and NdefRecord." into gingerbread
Merge commit '15f107b151deff1f25f1255bdbcb630ed576ac8d' into gingerbread-plus-aosp * commit '15f107b151deff1f25f1255bdbcb630ed576ac8d': New API stubs: NdefMessage and NdefRecord.
Diffstat (limited to 'libs/rs/rsObjectBase.cpp')
0 files changed, 0 insertions, 0 deletions