tree 11f9b52e26f05704f492d00337d0c4b37d0e203e
parent ed9985c5531b38f4ebffdd6ee48cbcaf22702803
parent 1a2060792f2a867422b51c0e4d352d8d3804e613
author Mark Salyzyn <salyzyn@google.com> 1394667438 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394667438 +0000

am 1a206079: am c6bb9727: Merge "[RIL] 64-bit compile issues"

* commit '1a2060792f2a867422b51c0e4d352d8d3804e613':
  [RIL] 64-bit compile issues