commit | 9551bcfd82ef8d3dd516829de77a5ba379953041 | [log] [tgz] |
---|---|---|
author | kmccormick <kmccormick@google.com> | Wed Jun 19 16:43:17 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 19 16:43:17 2013 -0700 |
tree | f5fdd917c0c8b4eed30664237e3e37760d997344 | |
parent | d11a3103046554e70023294446969a321779231a [diff] | |
parent | fb45dbeb216f513905e3c2bb7a86da6558862f42 [diff] |
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