tree 338664efdd32b37a2afb1210a515aab7322f66b0
parent 9f04178d32d9fd84ce99fe95401692077d69497a
parent 2225e1eb8c27a2f0c8bb650d248cd2e041517941
author Robert Greenwalt <rgreenwalt@google.com> 1461022800 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1461022800 +0000

Merge "Fix unit test to check both ECM configs" into nyc-dev