summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorRoman Nurik <romannurik@google.com>2012-03-07 17:05:32 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-03-07 17:05:32 -0800
commit1a30d4ab420a0eeef80846fa1556c9adf54ba062 (patch)
treec81186b4ebb626d27dcbe1b888ae07cf04e8c105 /core/java/android
parent6063f7965d1b3c548e044e358fd60720869625b2 (diff)
parent23b39217a5132bcf2cce94e98fbd486744f69958 (diff)
downloadframeworks_base-1a30d4ab420a0eeef80846fa1556c9adf54ba062.zip
frameworks_base-1a30d4ab420a0eeef80846fa1556c9adf54ba062.tar.gz
frameworks_base-1a30d4ab420a0eeef80846fa1556c9adf54ba062.tar.bz2
am 23b39217: am ce8697f8: am 96c757e5: Merge "docs: move Android Design from static HTML to JD" into ics-mr1
* commit '23b39217a5132bcf2cce94e98fbd486744f69958':
Diffstat (limited to 'core/java/android')
0 files changed, 0 insertions, 0 deletions