OSDN Git Service

am fb45dbeb: am 748f6c85: Merge "Doc change: New class on avoiding save conflicts...
authorkmccormick <kmccormick@google.com>
Wed, 19 Jun 2013 23:43:17 +0000 (16:43 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 19 Jun 2013 23:43:17 +0000 (16:43 -0700)
commit9551bcfd82ef8d3dd516829de77a5ba379953041
treef5fdd917c0c8b4eed30664237e3e37760d997344
parentd11a3103046554e70023294446969a321779231a
parentfb45dbeb216f513905e3c2bb7a86da6558862f42
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