| commit | 0951ce6aa25cedd007fb4af6f33b2cdfce1d5254 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Jun 12 15:16:28 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 12 15:16:28 2012 -0700 |
| tree | c6c2ad743b9fadb39f42104635cd528b03b31d82 | |
| parent | d676f3e69fce7bd67b672b270ab0240bfa69ce23 [diff] | |
| parent | 12d24b5aaba0752239401fc2c8b579e3b8ae97dd [diff] |
am 12d24b5a: resolved conflicts for merge of 76af0657 to jb-dev-plus-aosp * commit '12d24b5aaba0752239401fc2c8b579e3b8ae97dd': full_x86: use telephony profile