tree 7e53548b418e7fcad6e100aad8fac2bbdb36e6ed
parent 98474e759872b22db5783c29d45f084e33efeaab
parent da6eba785b8c165dee0ee0130291e1960bbd6d36
author Steven Moreland <smoreland@google.com> 1480613438 +0000
committer android-build-merger <android-build-merger@google.com> 1480613438 +0000

Merge "Always specify underlying enum type." am: 832f1a7978 am: e50a914c4e
am: da6eba785b

Change-Id: Iaaa659c72a41574508aff113797fd429b7426b3e