tree f5fdd917c0c8b4eed30664237e3e37760d997344
parent d11a3103046554e70023294446969a321779231a
parent fb45dbeb216f513905e3c2bb7a86da6558862f42
author kmccormick <kmccormick@google.com> 1371685397 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1371685397 -0700

am fb45dbeb: am 748f6c85: Merge "Doc change: New class on avoiding save conflicts" into jb-mr2-dev

* commit 'fb45dbeb216f513905e3c2bb7a86da6558862f42':
  Doc change: New class on avoiding save conflicts