tree 444deebe01bcd3b08f9284a619e7a7158bd9f6da
parent 87e2f3e918d9a1a6e7fdaaf464f77909e17525d3
parent 7d866fb63dc7eadef151493fc4ff78d7622c4d90
author Sanket Padawe <sanketpadawe@google.com> 1478040584 +0000
committer android-build-merger <android-build-merger@google.com> 1478040584 +0000

Merge "Fix broken asserts." am: b3897e1170
am: 7d866fb63d

Change-Id: Id7202829aeddec32bb965891dcbeb9d27084bb44