OSDN Git Service

am 05e89b22: am 3246d88d: resolved conflicts for merge of e8bb5c3a to klp-modular...
authorNarayan Kamath <narayan@google.com>
Mon, 3 Mar 2014 12:35:22 +0000 (12:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 3 Mar 2014 12:35:22 +0000 (12:35 +0000)
commit0fe8eac25f44159c3d3ebd280dc82abf073eb8ec
treee427da02a92e63857d165d56b26c6777908a6b84
parent3bbfddd2eae96b69be14baeca05726a70062ba6c
parent05e89b22a0bc1bbed1579c1bc6139b45ef41aa88
am 05e89b22: am 3246d88d: resolved conflicts for merge of e8bb5c3a to klp-modular-dev-plus-aosp

* commit '05e89b22a0bc1bbed1579c1bc6139b45ef41aa88':
  Amend 64 bit blacklist.