tree c23496f501084d13312494f84d0ab28c3cd2fa7a
parent ca8720d596e1f96026e9ce1200da49e14e5f45c9
parent 8e4ac6bd724812d561886446d2d27f470dc5e18a
author Nick Kralevich <nnk@google.com> 1439048722 -0700
committer Nick Kralevich <nnk@google.com> 1439048833 -0700

resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)

Change-Id: Iae7fe39e80a69f18025195d1a9074bd5c98ae904