| commit | 04753f4bb3abbcca2e78545c3c08fd230fb55383 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Mon May 02 12:20:24 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 02 12:20:24 2011 -0700 |
| tree | 3bfa8be5b0bd6d151c4cec29c7cbfd802d4b96d7 | |
| parent | e70d0c9c1b85a233608d85433a8dfc5dcb8441c9 [diff] | |
| parent | d0bc13e161401f92c73fa6ba0d4e525b30dac4c8 [diff] |
am d0bc13e1: (-s ours) am 60d10ec9: (-s ours) Merge from gingerbread - do not merge * commit 'd0bc13e161401f92c73fa6ba0d4e525b30dac4c8': Port RIL v4 to gingerbread from master.