tree 5f783e9a9509935c84fa8de1c13cc8f8336ca62e
parent 3c40c9d101236d8fac30e95a707410b91d0c65f3
parent d3e4700c9b40416136d918a95998f32ff0a7001e
author Tri Vo <trong@google.com> 1536098208 -0700
committer android-build-merger <android-build-merger@google.com> 1536098208 -0700

[automerger skipped] Merge "Update PageTypeInfoParser to be less restrictive." am: 0f34408378 am: 884b86fe77
am: d3e4700c9b  -s ours

Change-Id: I6211c03ae84c0e2d376419507a01a38c12bb47ea