am 6630ee16: am d63d8aea: Merge "Relax ordering requirements for non-conformant confi...
authorMika Isojärvi <misojarvi@google.com>
Wed, 6 May 2015 01:25:00 +0000 (01:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 6 May 2015 01:25:00 +0000 (01:25 +0000)
* commit '6630ee1608ef1346d942407d957748fae0c44f96':
  Relax ordering requirements for non-conformant configs.


Trivial merge