tree 40a30953a59cad60e64f90a2a95ca9d505ba7fc8
parent 0553cbcf3654734438fa8f2fc88b9c6f2578daa9
parent 6d06826b2424f5d937bf97576d3b51169c576fc5
author Dianne Hackborn <hackbod@google.com> 1494982243 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1494982248 +0000

Merge "Fix issue #38244875: Bring back testChargingConstraintFails" into oc-dev