tree 5aa14de256be26ba1051655028bae226ccb2eca1
parent 39fa5ee696b68b749952c284158191803c0672de
parent 6a5ea762de6b16d9f0fe211d58d442eef7610cfb
author Takayuki Hoshi <hoshi@google.com> 1421809555 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421809555 +0000

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

* commit '6a5ea762de6b16d9f0fe211d58d442eef7610cfb':
  Normalize ipv6.cts.PingTest#testLoopbackPing's packet size