tree fdb635477a01beadb8e92c2fb4cca2e647dcaa8b
parent c8a9db7120e7a1b5f5be35798b6bb13d1099edf9
parent 86e21f733049560e77b92f17a58474312d72ec3e
author Yorke Lee <yorkelee@google.com> 1397588722 -0700
committer Yorke Lee <yorkelee@google.com> 1397588722 -0700

resolved conflicts for merge of 86e21f73 to master-nova

Change-Id: Idcacd44a253d227a05704641bc9faa2c77106885