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)
* commit '0fe8eac25f44159c3d3ebd280dc82abf073eb8ec':
  Amend 64 bit blacklist.


Trivial merge