tree b8d5d98ff6da0995f1460179905ff9b2859e080e
parent 0e8136c081902c4f3dd0410476ef9dcf67cb4266
parent 48d3a66c9e424aa7cce8009a9ccc94a97b0d86a5
author Takayuki Hoshi <hoshi@google.com> 1421809555 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421809555 +0000

am 48d3a66c: am 2212f189: Merge "Normalize ipv6.cts.PingTest#testLoopbackPing\'s packet size" into lmp-sprout-dev

* commit '48d3a66c9e424aa7cce8009a9ccc94a97b0d86a5':
  Normalize ipv6.cts.PingTest#testLoopbackPing's packet size