summaryrefslogtreecommitdiffstats
path: root/samples
diff options
context:
space:
mode:
authorVladimir Chtchetkine <vchtchetkine@google.com>2011-11-23 15:14:20 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-23 15:14:20 -0800
commitc03537267d9da2124cdbf68d896bacf88d94cca9 (patch)
tree118ecce673888a74fea014638d80eb2650331837 /samples
parent603810939485089372245530fa3319dee850c776 (diff)
parent4d9806f5617fdd662ca3ef79989e6274d08e7ddc (diff)
downloadandroid_development-c03537267d9da2124cdbf68d896bacf88d94cca9.tar.gz
android_development-c03537267d9da2124cdbf68d896bacf88d94cca9.tar.bz2
android_development-c03537267d9da2124cdbf68d896bacf88d94cca9.zip
Merge "Cherry-picked from 6f00e7fc in master. Do not merge." into ics-mr1
Diffstat (limited to 'samples')
0 files changed, 0 insertions, 0 deletions