am aadcdef3: am 191d06b5: am 74147527: am 8505c387: Special case AppCompat to show action bar. automerge: bb600de6 automerge: 8d9361a4 * commit 'aadcdef3':