tree d834f5f8bbb5991e16355e56a899a8b71d163976
parent 21249a4d1957aa828f7c25f2ce8b0a2f84d9f964
parent d6234b79f594d7c27c68db8f5768b8b8ae26dc95
author Heidi von Markham <hvm@google.com> 1429565494 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429565494 +0000

am d6234b79: am ba8dd770: Merge "Docs: Adding 2 images (code-lines and life-of-a-patch)"

* commit 'd6234b79f594d7c27c68db8f5768b8b8ae26dc95':
  Docs: Adding 2 images (code-lines and life-of-a-patch)