tree 653dbbe6b71e83a62832b9d44b319e6e937d091c
parent e2ee1baff8f1c0275e28ad4ccd5018545933a6e3
parent 5e9725191f0e263e235c8cf014e11aeae610993b
author Nick Kralevich <nnk@google.com> 1439044727 -0700
committer Nick Kralevich <nnk@google.com> 1439044727 -0700

resolve merge conflicts of 5e972519 to jb-mr1.1-docs

Change-Id: Ie5af5f01ead4d29cf84d2951606ddcd9f95a5b70