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)
Merge commit '060f053e816137fb4f5e03c15b5122c92219ed52' into gingerbread-plus-aosp

* commit '060f053e816137fb4f5e03c15b5122c92219ed52':
  DO NOT MERGE

1  2 
libril/ril.cpp

diff --cc libril/ril.cpp
Simple merge