summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorRoman Nurik <romannurik@google.com>2012-03-06 14:54:19 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-03-06 14:54:19 -0800
commit23b39217a5132bcf2cce94e98fbd486744f69958 (patch)
treee65d5343eb5e25b4500588c55087244ab6602df8 /core/java/android
parent30e9f8807e6c7fd7f450b2d4ee91badb1afa4d77 (diff)
parentce8697f8d5368aa617b853fdabb6d7fb980bc5ce (diff)
downloadframeworks_base-23b39217a5132bcf2cce94e98fbd486744f69958.zip
frameworks_base-23b39217a5132bcf2cce94e98fbd486744f69958.tar.gz
frameworks_base-23b39217a5132bcf2cce94e98fbd486744f69958.tar.bz2
am ce8697f8: am 96c757e5: Merge "docs: move Android Design from static HTML to JD" into ics-mr1
* commit 'ce8697f8d5368aa617b853fdabb6d7fb980bc5ce':
Diffstat (limited to 'core/java/android')
0 files changed, 0 insertions, 0 deletions