tree eab534f19bee1fbe7f4778d8ae1bf39bed62380c
parent a5ec9213f9848e3c8e904f182a8fbdb2e65aec30
parent 0a57a1112ff45507ef6361aabf42c97460405f47
author RoboErik <epastern@google.com> 1397774595 -0700
committer RoboErik <epastern@google.com> 1397774595 -0700

resolved conflicts for merge of 0a57a111 to master-nova

Change-Id: Id9fad51341239051203a219d58213b9438effc50