summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2010-11-03 12:02:53 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-03 12:02:53 -0700
commita935bc4696e4060c362b0f6913cc220331667a35 (patch)
treeedb48bc69001ca3ef96bf072d71441bc8a60d547
parentb251f75d5ca3fa19cfe8a284717e00dec31f18ea (diff)
parent26490f71a5a50b2200d60de28ad0ea6b1d0a1847 (diff)
downloadframeworks_av-a935bc4696e4060c362b0f6913cc220331667a35.zip
frameworks_av-a935bc4696e4060c362b0f6913cc220331667a35.tar.gz
frameworks_av-a935bc4696e4060c362b0f6913cc220331667a35.tar.bz2
am a3f5b615: (-s ours) am f3847e87: Merge "DO NOT MERGE" into gingerbread
* commit 'a3f5b615d7adc5a644cbedd55100deba562ec0ac': DO NOT MERGE
0 files changed, 0 insertions, 0 deletions