Merge "Fix portrait-orientation assumptions am: 3855bb499f am: dbe726e318" into nyc-mr1-dev-plus-aosp
am: 7644c106ed

* commit '7644c106ed9c11605a76261de573bfa14d039052':
  Fix portrait-orientation assumptions

Change-Id: I238d669cd158c60ce5e504b29cb69b1b0b45bdfb
tree: ba24fe1845559ba629832dc38787ed98f5b3a415
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml