tree 4557bdde7a64de063a652d8242f661d2769fec53
parent b017932e4a659f637085e37e09e3aa20849d62b8
parent 7e6c53366d916e11fd6237c9456c394ff6a1cb1f
author Vinod Krishnan <vinodkrishnan@google.com> 1400208250 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400208250 +0000

am 7e6c5336: Merge "Adding a portrait and landscape file" into klp-modular-dev

* commit '7e6c53366d916e11fd6237c9456c394ff6a1cb1f':
  Adding a portrait and landscape file