tree de92a2b53d87a5144d903864bda1436026efa5bb
parent 9ef251d5230c677aa1dbada1c8c53cbd51c8d643
parent 349f7ed040a1c291a6b32e9112484d1c6636db76
author Jun Tahara <jun.xb.tahara@sonymobile.com> 1466554173 +0000
committer android-build-merger <android-build-merger@google.com> 1466554173 +0000

Merge \"Remove non-CTS packets assertion code\" into marshmallow-cts-dev
am: 0ba763ab98

Change-Id: I9d9549d4388af53475a0457f7be1d55d88d5e72d