summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-04-21 09:10:43 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2010-04-21 09:10:43 -0700
commitf021d12f6f7116e9275cd3553a349ce5cb8aab14 (patch)
tree94cb2b13e3f75ad18ab56605781d1eb74698d07e /core/res
parent172673cd5b21dee6e175ab67235aa19bc2689868 (diff)
parent5a870fee53ca94c7575503c72574ca0f068d52c7 (diff)
downloadframeworks_base-f021d12f6f7116e9275cd3553a349ce5cb8aab14.zip
frameworks_base-f021d12f6f7116e9275cd3553a349ce5cb8aab14.tar.gz
frameworks_base-f021d12f6f7116e9275cd3553a349ce5cb8aab14.tar.bz2
merge from open-source master
Change-Id: I08f1feae65b1dfc3f740d78654c267f2e3ae5e85
Diffstat (limited to 'core/res')
0 files changed, 0 insertions, 0 deletions