OSDN Git Service

Merge "Add support for iif rules."
authorLorenzo Colitti <lorenzo@google.com>
Tue, 27 Oct 2015 06:35:45 +0000 (06:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Oct 2015 06:35:45 +0000 (06:35 +0000)
commitf9e010c6fef768a919cdc11df8932131da9ec512
tree31bcc2c220fdf6a9419178b6f2ad03f841f1ef76
parentfb61164cad4d38ecaefc903f81f18a708c2afa62
parent60a057589fa095a7fed16ea52a927916ab153781
Merge "Add support for iif rules."
am: 60a057589f

* commit '60a057589fa095a7fed16ea52a927916ab153781':
  Add support for iif rules.