tree b5003fc26e339782caf7f436e2e77e75cd165088
parent d913d3ec407f6e1253915e06e253000b094ea5dd
parent ce04896bd0f9be927d38c62c5fb67aed83f5d4cb
author Marie White <mariewhite@google.com> 1504896303 +0000
committer android-build-merger <android-build-merger@google.com> 1504896303 +0000

Merge "Set enum to fixed size type" into oc-mr1-dev am: a60e6a4548
am: ce04896bd0

Change-Id: I56086c2d9fd23497151f919417cb8feaab056c10