tree cdaded25c6b931f05f74fa9cd18bf9378e4b264c
parent 5c524216a1b6e905acec1b1b8a715b328abb1ad6
parent 45231190de997255fec4091b3881ef908f072366
author Android Build Merger (Role) <android-build-merger@google.com> 1499887251 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499887251 +0000

Merge "Reject unsorted cmap entries. DO NOT MERGE am: 66a7640f69 am: 03297bfa64 am: 3d66839309 am: 62fee42776  -s ours am: fff8d5d037 am: a992110ec8 am: 5293f4346d am: 53bfd46ced am: 39cde835b7  -s ours am: 79103646aa am: c704857da5" into oc-dr1-dev-plus-aosp