OSDN Git Service

am 5303f9d3: resolved conflicts for merge of 277ba466 to klp-modular-dev-plus-aosp
authorNarayan Kamath <narayan@google.com>
Thu, 27 Feb 2014 13:56:09 +0000 (13:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Feb 2014 13:56:09 +0000 (13:56 +0000)
commitde34aea544cb4222f24e4157b96962b09445e2c5
treea0f5279f3cb8c4356f59da24a0d97f5cd33b321c
parent273071ca5b91ca490a884ebe3b504085b9b3ca3d
parent5303f9d369946f43167b5e2423799d30c4455df1
am 5303f9d3: resolved conflicts for merge of 277ba466 to klp-modular-dev-plus-aosp

* commit '5303f9d369946f43167b5e2423799d30c4455df1':
  Various fixes for LP64