tree 2facfb673bde2c8e0d41d2a7e33e48a5306af514
parent 327994977fa865421c522cf089a2692b2c837ed5
parent 2a9abb34d8be77b1dbacb5282480e39deae5d9a1
author Deepanshu Gupta <deepanshu@google.com> 1420885515 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420885515 +0000

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

* commit '2a9abb34d8be77b1dbacb5282480e39deae5d9a1':