Commits
Chris Wren authored and Android Git Automerger committed 01a73cd81eaM
am 500db3c1: am d5b0f69a: am 208934ff: Merge "fix build by restoring deleted enum" into mnc-dev * commit '500db3c10dda42c32da3c54733de7b1ab22bc583': fix build by restoring deleted enum
Showing diff to711ff3323fd