diff options
author | Roman Nurik <romannurik@google.com> | 2012-03-06 14:54:19 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-06 14:54:19 -0800 |
commit | 23b39217a5132bcf2cce94e98fbd486744f69958 (patch) | |
tree | e65d5343eb5e25b4500588c55087244ab6602df8 /core/java/android | |
parent | 30e9f8807e6c7fd7f450b2d4ee91badb1afa4d77 (diff) | |
parent | ce8697f8d5368aa617b853fdabb6d7fb980bc5ce (diff) | |
download | frameworks_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