OSDN Git Service

am 3246d88d: resolved conflicts for merge of e8bb5c3a to klp-modular-dev-plus-aosp
authorNarayan Kamath <narayan@google.com>
Mon, 3 Mar 2014 12:32:11 +0000 (12:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 3 Mar 2014 12:32:11 +0000 (12:32 +0000)
* commit '3246d88d6c71cceec967241337f9da33e1b12d02':
  Amend 64 bit blacklist.


Trivial merge