tree 48221ce2737261b73bb445df385c42dd21e5df0b
parent 64b545f5946257872e1ea3800547a999111e699c
parent 17ee86e40a3f229f19f55e12b7da7b9d515a45a3
author Takayuki Hoshi <hoshi@google.com> 1442280542 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442280542 +0000

am 17ee86e4: am 6ee31d95: am 4544716d: am 7f9f8b1d: am f8e24166: am 2212f189: Merge "Normalize ipv6.cts.PingTest#testLoopbackPing\'s packet size" into lmp-sprout-dev

* commit '17ee86e40a3f229f19f55e12b7da7b9d515a45a3':