| commit | 3d6b009db124615a09e2c6dcf25bf8352f6aaca9 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Sep 10 11:29:10 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 10 11:29:10 2010 -0700 |
| tree | fd62f638908e2c4828a7e42a93912e492c588cc3 | |
| parent | 200c13d37fb394c218a3824c428a116207266316 [diff] | |
| parent | 09f1e2b2151ea18c05b9138a0a5cb63af18ea373 [diff] |
am 09f1e2b2: resolved conflicts for merge of 56aa3c76 to gingerbread-plus-aosp Merge commit '09f1e2b2151ea18c05b9138a0a5cb63af18ea373' * commit '09f1e2b2151ea18c05b9138a0a5cb63af18ea373': Initial contribution from Sony Corporation.