am d63d8aea: Merge "Relax ordering requirements for non-conformant configs." into...
authorMika Isojärvi <misojarvi@google.com>
Mon, 11 Jan 2016 19:32:01 +0000 (19:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:32:01 +0000 (19:32 +0000)
am: 6630ee1608

* commit '6630ee1608ef1346d942407d957748fae0c44f96':


Trivial merge