tree 95484355471ffa17cce9afcc444d99d3b116e7ae
parent 42aaacf183b0ee7af989d2fce1d8b29401dfb61a
parent cbeb6e81fe8faaa1c138ebe213d2b6e7fb0ad251
author Ying Wang <wangying@android.com> 1373593939 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1373593939 -0700

am cbeb6e81: Merge "Include ping6 in all device builds"

* commit 'cbeb6e81fe8faaa1c138ebe213d2b6e7fb0ad251':
  Include ping6 in all device builds