tree f1a69a4a6045da8c224ecc5abec7d3c60a84caba
parent 5f519e77a5f240fac2785e2d3f1c0637e499ac9e
parent f1df0f59c174687b5f9a8ca0163fea3921915ae8
author John Reck <jreck@google.com> 1449874060 -0800
committer John Reck <jreck@google.com> 1449874060 -0800

resolve merge conflicts of f1df0f59c1 to master.

Change-Id: Ia0ae0f753541f5203a4a3683721361c5e90ddae8