| commit | 0db9f4ddd7a339e4ba1cf16d7a9b49234635ff09 | [log] [tgz] |
|---|---|---|
| author | kmccormick <kmccormick@google.com> | Wed Jun 19 16:48:14 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 19 16:48:14 2013 -0700 |
| tree | 4db41af8f1616d8aca5f887e1c1c89be15a22f82 | |
| parent | fb5a41a371e540f402e3dd987b0fbf92d1267902 [diff] | |
| parent | 9551bcfd82ef8d3dd516829de77a5ba379953041 [diff] |
am 9551bcfd: am fb45dbeb: am 748f6c85: Merge "Doc change: New class on avoiding save conflicts" into jb-mr2-dev * commit '9551bcfd82ef8d3dd516829de77a5ba379953041': Doc change: New class on avoiding save conflicts