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