summaryrefslogtreecommitdiffstats
path: root/core/java/android/app
diff options
context:
space:
mode:
authorRobert Ly <robertly@google.com>2012-04-10 14:30:32 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-04-10 14:30:32 -0700
commit030c86145a011dc20012f2a63aa0da6e365c50b2 (patch)
treedf2e0ea38219ecca361bd897fa8c947e0b094815 /core/java/android/app
parent21b2ec7980b405f5c808a265c04cc1b3f1ae23de (diff)
parentb3f7fc2f7769defa8c7de9254f0cba163a2ea63e (diff)
downloadframeworks_base-030c86145a011dc20012f2a63aa0da6e365c50b2.zip
frameworks_base-030c86145a011dc20012f2a63aa0da6e365c50b2.tar.gz
frameworks_base-030c86145a011dc20012f2a63aa0da6e365c50b2.tar.bz2
am b3f7fc2f: am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1
* commit 'b3f7fc2f7769defa8c7de9254f0cba163a2ea63e': docs: fixing ndk bug 5991108
Diffstat (limited to 'core/java/android/app')
0 files changed, 0 insertions, 0 deletions