OSDN Git Service

am 12d24b5a: resolved conflicts for merge of 76af0657 to jb-dev-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Tue, 12 Jun 2012 22:16:28 +0000 (15:16 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 12 Jun 2012 22:16:28 +0000 (15:16 -0700)
* commit '12d24b5aaba0752239401fc2c8b579e3b8ae97dd':
  full_x86: use telephony profile


Trivial merge