OSDN Git Service

am 060f053e: DO NOT MERGE
authorXia Wang <xiaw@google.com>
Fri, 30 Jul 2010 20:46:14 +0000 (13:46 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 30 Jul 2010 20:46:14 +0000 (13:46 -0700)
commit2e977068a167ea597b6514501d2221c5a4e22574
tree8be6bbaae40984dfd984ecf2ab9721b3108b7931
parent678966d7694d0c69c933bc7ff14886012358c200
parent060f053e816137fb4f5e03c15b5122c92219ed52
am 060f053e: DO NOT MERGE

Merge commit '060f053e816137fb4f5e03c15b5122c92219ed52' into gingerbread-plus-aosp

* commit '060f053e816137fb4f5e03c15b5122c92219ed52':
  DO NOT MERGE
libril/ril.cpp