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

* commit 'd690596c71445b44da447066e8c068a8df745262':


Trivial merge