| commit | 23498ca0a60505d5a38c37cc770cd7e4a7cf50f0 | [log] [tgz] |
|---|---|---|
| author | repo sync <enh@google.com> | Sun May 02 16:15:37 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun May 02 16:15:37 2010 -0700 |
| tree | 0d9747818a30e1d7c635e0cce2f5a1100d5ec546 | |
| parent | cfb42287277a188ecefa02d0d64f64a12a1909e1 [diff] | |
| parent | e6d15c5f2f021ff61a33961553e9373124aa791c [diff] |
am e6d15c5f: am b8062e17: am 0a310052: resolved conflicts for merge of f3565212 to froyo-plus-aosp