tree 34db2288a353d2ee755d16419ea6a5b46501e700
parent 0e6e912b5440e468e42ac1d683bf8bdb5ffd48f3
parent 859d1e490bcf07be9353a0e6c26264ef38fe0610
author Alex Ray <aray@google.com> 1380921677 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380921677 -0700

am 859d1e49: am d457ec52: Add feature android.hardware.consumerir xml file

* commit '859d1e490bcf07be9353a0e6c26264ef38fe0610':
  Add feature android.hardware.consumerir xml file