commit | a935bc4696e4060c362b0f6913cc220331667a35 | [log] [tgz] |
---|---|---|
author | James Dong <jdong@google.com> | Wed Nov 03 12:02:53 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 03 12:02:53 2010 -0700 |
tree | edb48bc69001ca3ef96bf072d71441bc8a60d547 | |
parent | b251f75d5ca3fa19cfe8a284717e00dec31f18ea [diff] | |
parent | 26490f71a5a50b2200d60de28ad0ea6b1d0a1847 [diff] |
am a3f5b615: (-s ours) am f3847e87: Merge "DO NOT MERGE" into gingerbread * commit 'a3f5b615d7adc5a644cbedd55100deba562ec0ac': DO NOT MERGE