tree b13623e8709738d4c85ad80ed0687d000a33362a
parent 9c9bcd3486d9f7557329dea90b3c5fa1bdace91c
parent 21246bd92f54be468496848b659bf47f2522430a
author Diego Perez <diegoperez@google.com> 1430958069 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430958069 +0000

am 21246bd9: am 8e75e307: am 1bc7fb2d: Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev

* commit '21246bd92f54be468496848b659bf47f2522430a':
  Fix isThemeAppCompat NPE when using an invalid theme