Merge "Fix portrait-orientation assumptions am: 3855bb499f am: 0c1c16d651" into nyc-mr1-dev-plus-aosp
tree: ba24fe1845559ba629832dc38787ed98f5b3a415
  1. Android.mk
  2. AndroidManifest.xml
  3. res/
  4. src/