| commit | 6ca911a976a277e69800249c924c8dbc8fc5d78f | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Thu Mar 21 07:14:11 2013 -0700 |
| committer | Wink Saville <wink@google.com> | Thu Mar 21 07:14:11 2013 -0700 |
| tree | 3490a335fd1e0d81473f3764055186239c10a50d | |
| parent | 2c74d79cab4eee87acf0e74c0d8bf76be8f0f4aa [diff] | |
| parent | f606e5ccae365aa765bf99291241d54f221c9fa4 [diff] |
Merge commit 'f606e5cc' into fix-merge-conflict * commit 'f606e5cc': RIL: Correct the RIL_REQUEST_DIAL api missmatch Conflicts: src/java/com/android/internal/telephony/RIL.java Change-Id: Ib2b477628e14ca221acad35f4a2cf9a44170a33e