tree b9f9ead3d39b38ff80c6c838386f354e90384a0e
parent 92fe44e966b9622c24a6810aaf9c2d8e2b1f9d92
parent 3aee38c86e1a1dbc62b7ad5f4d08dd7d3db6d496
author Dianne Hackborn <hackbod@google.com> 1446583632 -0800
committer Dianne Hackborn <hackbod@google.com> 1446583632 -0800

resolve merge conflicts of 3aee38c86e to master.

Change-Id: I9ff3f92b37e24f5f0527a0034b159920f6d7ffe1