am 9e96c69e: am 6757572b: Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev

* commit '9e96c69e3e9ebdb820acd347b4691c32a5d76be4':
  Add throwing InvalidDisplayException from addView.