am 2c5a4b3d: am 4e61e3f8: Merge "Make AtomicFile a public API. It\'s about time!" into jb-mr1-dev

* commit '2c5a4b3d9e2fdd87ec727e514203143f77dd1595':
  Make AtomicFile a public API.  It's about time!
This commit is contained in:
Dianne Hackborn
2012-07-31 18:15:26 -07:00
committed by Android Git Automerger

View File

@@ -29,8 +29,8 @@ import android.net.NetworkStatsHistory;
import android.net.NetworkTemplate; import android.net.NetworkTemplate;
import android.net.TrafficStats; import android.net.TrafficStats;
import android.text.format.DateUtils; import android.text.format.DateUtils;
import android.util.AtomicFile;
import com.android.internal.os.AtomicFile;
import com.android.internal.util.FileRotator; import com.android.internal.util.FileRotator;
import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.IndentingPrintWriter;
import com.android.internal.util.Objects; import com.android.internal.util.Objects;