OSDN Git Service

am a4f9cab8: (-s ours) am 14171dca: Port Mock Ril from master branch to GB. DO NOT...
authorXia Wang <xiaw@google.com>
Fri, 8 Oct 2010 21:36:51 +0000 (14:36 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 8 Oct 2010 21:36:51 +0000 (14:36 -0700)
commitbffcbfe7e31f88961eae070e3c9833d87ccd8a44
tree1b52c2c7891906a3f75e86107c8eee939abc294c
parent66d51de2f22371280020a6057c6d128e3967024a
parenta4f9cab81d7a97e6489f1a1629d5c40ce6058477
am a4f9cab8: (-s ours) am 14171dca: Port Mock Ril from master branch to GB. DO NOT MERGE

Merge commit 'a4f9cab81d7a97e6489f1a1629d5c40ce6058477'

* commit 'a4f9cab81d7a97e6489f1a1629d5c40ce6058477':
  Port Mock Ril from master branch to GB. DO NOT MERGE