tree 03dd14649d58d6b816faa442b67356d9b8005539
parent 6ab7c406cc5f2e28b6686976b350504fc538caaf
parent b6bc4300ffcc0307d7097af1ce1459b0f2330f0e
author Yang Ni <yangni@google.com> 1490283427 +0000
committer android-build-merger <android-build-merger@google.com> 1490283427 +0000

Merge "Removed incorrect asserts" am: 10657f54a0 am: 8607bbce71
am: b6bc4300ff

Change-Id: Iee45b66f9f5472fe0123a5560d9af9f03a220280