summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorDan Egnor <egnor@google.com>2010-06-01 14:44:35 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-01 14:44:35 -0700
commit5220f483382d314b38e24a4520080eae63005eb7 (patch)
treece2620bfcd981e0b9a023ba424f4dfb00c53ec4a /libs
parent9ec89bbbf8d54142211463d827cbba131788ca9e (diff)
parentd691a841f62c38f4fdf045c5143e7de7fb0336e8 (diff)
downloadframeworks_native-5220f483382d314b38e24a4520080eae63005eb7.zip
frameworks_native-5220f483382d314b38e24a4520080eae63005eb7.tar.gz
frameworks_native-5220f483382d314b38e24a4520080eae63005eb7.tar.bz2
am 1f5e8473: am a80331c4: Merge "Comment-only change to add documentation for FileObserver" into froyo
Merge commit '1f5e847350ef1aece046666e20e7692a1651d9dc' into kraken * commit '1f5e847350ef1aece046666e20e7692a1651d9dc': Comment-only change to add documentation for FileObserver
Diffstat (limited to 'libs')
0 files changed, 0 insertions, 0 deletions