tree f80e8a221f52c5cc58cad07886fdad255ec500ca
parent 3067297209f91275c02e802d5d6319805b82510a
parent 451e91c5d31daf1157188f913a0485179107c548
author Deepanshu Gupta <deepanshu@google.com> 1399949475 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399949475 +0000

am 451e91c5: am 83d33e06: am ffb18143: (-s ours) am 0d90b43b: am cb240066: am 977ede48: (-s ours) am 51ce58a7: am 37f43311: am 9887703d: am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]

* commit '451e91c5d31daf1157188f913a0485179107c548':
  Add orientation to configuration for layoutlib. [DO NOT MERGE]