OSDN Git Service

am 9ca25502: am 48250e14: am 9a09a523: am 0b472ae1: Merge "androidfw: resolve 64...
authorMark Salyzyn <salyzyn@google.com>
Wed, 19 Mar 2014 19:58:00 +0000 (19:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 19 Mar 2014 19:58:00 +0000 (19:58 +0000)
* commit '9ca25502c05854288733ee5142e8bf6594821f83':
  androidfw: resolve 64-bit build issues

1  2 
libs/androidfw/BackupData.cpp

Simple merge