summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-06-07 07:56:00 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-07 07:56:00 -0700
commit2769e60438173f6bcf9cdfa193af0a77c399d6c9 (patch)
treeb96f637a02c8b7e748e783cb20c272efe6e0d625 /res
parent23e3346d150311a9c1843a6c542b7de564d12485 (diff)
parent65cf68daed8ea6ee1c6d7b11e508847a69b15f6b (diff)
downloadpackages_apps_nfc-2769e60438173f6bcf9cdfa193af0a77c399d6c9.zip
packages_apps_nfc-2769e60438173f6bcf9cdfa193af0a77c399d6c9.tar.gz
packages_apps_nfc-2769e60438173f6bcf9cdfa193af0a77c399d6c9.tar.bz2
am 65cf68da: Reconcile with jb-release
* commit '65cf68daed8ea6ee1c6d7b11e508847a69b15f6b':
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions