am 51c6ae52: am ecbbfdd3: Merge "Make ActionBar fail more cleanly when invalid...
am 51c6ae52: am ecbbfdd3: Merge "Make ActionBar fail more cleanly when invalid heights are set" into jb-mr1-dev
* commit '51c6ae52':
Make ActionBar fail more cleanly when invalid heights are set