summaryrefslogtreecommitdiffstats
path: root/core/jni/NOTICE
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-10-15 18:23:34 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-15 18:23:34 -0700
commit81df9841c64e417fe2adfab0e8d694af09e07c0d (patch)
treee02b8ab105ca55afc5c26c6675294583a3f75d8c /core/jni/NOTICE
parentb2bd470010279fe45e2848aa8cd0b3ad6f6ca800 (diff)
parent2c1dab44834fb20deda9f380dae1bd7c1826b40b (diff)
downloadframeworks_base-81df9841c64e417fe2adfab0e8d694af09e07c0d.zip
frameworks_base-81df9841c64e417fe2adfab0e8d694af09e07c0d.tar.gz
frameworks_base-81df9841c64e417fe2adfab0e8d694af09e07c0d.tar.bz2
am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo
Merge commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b' into gingerbread-plus-aosp * commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b': docs: fix typo; surface dev guide link in package description
Diffstat (limited to 'core/jni/NOTICE')
0 files changed, 0 insertions, 0 deletions