tree 3f89f2e3c1eae94d0fae9b4812ce36ce4326466e
parent 81508de3d277db2ef3c8aa55b57ce3ce0a142e48
parent 63dc592789e386ba2cd4e748090ba71d449a1e7c
author Elliott Hughes <enh@google.com> 1357261179 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357261179 -0800

am 63dc5927: Merge "Add AF_CAN and PF_CAN (and other missing families)."

* commit '63dc592789e386ba2cd4e748090ba71d449a1e7c':
  Add AF_CAN and PF_CAN (and other missing families).