OSDN Git Service

am f1efa3ee: Merge "resolved conflicts for merge of 22d07464 to master"
authorNarayan Kamath <narayan@google.com>
Thu, 27 Mar 2014 14:37:00 +0000 (14:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Mar 2014 14:37:00 +0000 (14:37 +0000)
commit902c995c7fb30971e9d7ed44a3eab5aa9b86e23c
tree60a9a593635c3feefdc8b9611b09d66f99528121
parent5ac398675a28437fbb4655fae84c32b5eadd4ddf
parentf1efa3eecc720d5920cbb1cf3fc1c4da3252f5a4
am f1efa3ee: Merge "resolved conflicts for merge of 22d07464 to master"

* commit 'f1efa3eecc720d5920cbb1cf3fc1c4da3252f5a4':
  AArch64: Make frameworks/base code more portable