tree 0efa9d03c0ee4442b8e42e0d86f90ea1a561e63a
parent 32a2864389661520682f65856eb027dea57d76b5
parent f53bfc911fa88c15b25f38553a5647ad00f221a3
author Stephen Hines <srhines@google.com> 1469164747 -0700
committer Stephen Hines <srhines@google.com> 1469164747 -0700

resolve merge conflicts of f53bfc9 to master

Change-Id: Idb454415b166b2ff215c604475dd9129958e7edd