tree fd382975b66bf5c7d8b39d336c7cc160bbf06fdf
parent db10020d159137c8113a692b1e3f794723a64ddf
parent 1c1420995068dec2ac05507d7045d31350bdcbdb
author Andreas Gampe <agampe@google.com> 1518803834 +0000
committer android-build-merger <android-build-merger@google.com> 1518803834 +0000

Merge "Framework: Disable [MissingOverride] for platformprotos" am: 4eaa22f24e
am: 1c14209950

Change-Id: Ib664802f2a8673ba0d1504a9b93f764ae993b044