am f2e04ac7: am c598047d: am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar. automerge: 8e2dd14
automerge: 2223018

* commit '22230189be8e811881ba24de1cde97f9882a7d45':
  Special case AppCompat to show action bar.