OSDN Git Service

am 0fe8eac2: am 05e89b22: am 3246d88d: resolved conflicts for merge of e8bb5c3a to...
authorNarayan Kamath <narayan@google.com>
Mon, 3 Mar 2014 13:22:29 +0000 (05:22 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 3 Mar 2014 13:22:29 +0000 (05:22 -0800)
commit3bfc0548588c9908470115a9a979ce5d5679eac7
treebcbbc3af15e017fb7af9cfd26583d652314840fe
parenta60f06d39cc8c976d6d55ba95d399f20b6653419
parent0fe8eac25f44159c3d3ebd280dc82abf073eb8ec
am 0fe8eac2: am 05e89b22: am 3246d88d: resolved conflicts for merge of e8bb5c3a to klp-modular-dev-plus-aosp

* commit '0fe8eac25f44159c3d3ebd280dc82abf073eb8ec':
  Amend 64 bit blacklist.