tree 447543875a1772c7070e6513da42f088d5127a31
parent add1fb69e0d4fb17bf658b68408a033937a13683
parent 2ac2ff8f74f1b4b9d48dbc252bf3e77ea34edb55
author Christopher Lane <lanechr@google.com> 1397513641 -0700
committer Christopher Lane <lanechr@google.com> 1397513641 -0700

resolved conflicts for merge of 381ac080 to master

Change-Id: I779c49c48980ba7737ee4e7b04a9e4c3e02fca21