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

* commit '2a9abb34d8be77b1dbacb5282480e39deae5d9a1':