tree 50f60babd50ea46b151af5e95cf0b3e22d4affcc
parent e0dc3f2975c5fe7ec8c907d1cd68340c9127b427
parent 1d6d16d6995099afa506ecac38019a5bb8eacd86
author Julia Reynolds <juliacr@google.com> 1457458739 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1457458741 +0000

Merge "Condition cleanup." into nyc-dev