tree 7677d9d297d90b0b227fed763bf417ff6c43bddc
parent 2a15a07bf567202c5c10e406019d98a0b98f46fd
parent f9e010c6fef768a919cdc11df8932131da9ec512
author Lorenzo Colitti <lorenzo@google.com> 1445927922 +0000
committer android-build-merger <android-build-merger@google.com> 1445927922 +0000

Merge "Add support for iif rules." am: 60a057589f
am: f9e010c6fe

* commit 'f9e010c6fef768a919cdc11df8932131da9ec512':
  Add support for iif rules.