diff options
| author | Cary Clark <cary@android.com> | 2009-10-16 07:12:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-16 07:12:54 -0700 |
| commit | d21b725627e68b8ffcae38729196e8c1bd5d0d15 (patch) | |
| tree | 413ecc2729af907f6b0ae8b57a6d867da0fec130 /include | |
| parent | e1f43dadb9a1f0744f7e24373ca796c7a8ca2b12 (diff) | |
| parent | 39e6773431e6010c5066c0e13facfd943c932c7e (diff) | |
| download | frameworks_base-d21b725627e68b8ffcae38729196e8c1bd5d0d15.zip frameworks_base-d21b725627e68b8ffcae38729196e8c1bd5d0d15.tar.gz frameworks_base-d21b725627e68b8ffcae38729196e8c1bd5d0d15.tar.bz2 | |
am 39e67734: (-s ours) do not merge: fix copy/paste using trackball on passion
Merge commit '39e6773431e6010c5066c0e13facfd943c932c7e' into eclair-mr2
* commit '39e6773431e6010c5066c0e13facfd943c932c7e':
do not merge: fix copy/paste using trackball on passion
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions