tree 2959d902d64b6557cbd8c25b67553a7ff6e25342
parent b92f83c0512bfb93e85d6cd8d6efd6681017664c
parent 2b6f9ce823adf9be2045452f4337a22500567ffc
author Jeff Vander Stoep <jeffv@google.com> 1454369098 -0800
committer Jeff Vander Stoep <jeffv@google.com> 1454369098 -0800

resolve merge conflicts of 2b6f9ce823 to master.

Change-Id: I69f36f560334b11b099f2eb15999603dd2469d4f