| commit | aed7823abe0a08e4ab4cf73ce3e28f4e39a03af7 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sat Aug 08 08:45:22 2015 -0700 |
| committer | Nick Kralevich <nnk@google.com> | Sat Aug 08 08:47:13 2015 -0700 |
| tree | c23496f501084d13312494f84d0ab28c3cd2fa7a | |
| parent | ca8720d596e1f96026e9ce1200da49e14e5f45c9 [diff] | |
| parent | 8e4ac6bd724812d561886446d2d27f470dc5e18a [diff] |
resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours) Change-Id: Iae7fe39e80a69f18025195d1a9074bd5c98ae904