am 2a9abb34: am aadcdef3: am 191d06b5: am 74147527: am 8505c387: Special case AppCompat to show action bar. automerge: bb600de automerge: 8d9361a automerge: db343ec
automerge: c2d2272

* commit 'c2d22720420e1128876d3b99f52ddba8c0ddd074':