| commit | 8e4ac6bd724812d561886446d2d27f470dc5e18a | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sat Aug 08 07:38:47 2015 -0700 |
| committer | Nick Kralevich <nnk@google.com> | Sat Aug 08 07:38:47 2015 -0700 |
| tree | 653dbbe6b71e83a62832b9d44b319e6e937d091c | |
| parent | e2ee1baff8f1c0275e28ad4ccd5018545933a6e3 [diff] | |
| parent | 5e9725191f0e263e235c8cf014e11aeae610993b [diff] |
resolve merge conflicts of 5e972519 to jb-mr1.1-docs Change-Id: Ie5af5f01ead4d29cf84d2951606ddcd9f95a5b70