Merge "Explicitly flush compress/encrypt stream before close" into nyc-mr1-dev

author Chris Tate <ctate@android.com>

Tue, 12 Jul 2016 22:46:59 +0000 (22:46 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 12 Jul 2016 22:47:00 +0000 (22:47 +0000)
author Chris Tate <ctate@android.com>
Tue, 12 Jul 2016 22:46:59 +0000 (22:46 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 12 Jul 2016 22:47:00 +0000 (22:47 +0000)
diff --cc services/backup/java/com/android/server/backup/BackupManagerService.java
Simple merge
author	Chris Tate <ctate@android.com>
	Tue, 12 Jul 2016 22:46:59 +0000 (22:46 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 12 Jul 2016 22:47:00 +0000 (22:47 +0000)