tree 97e9f9e6303478e757f0dcc6129fb0b8da363622
parent 6edb6b390107a39aa1e486ce61795de4ff2a33f4
parent f9bd3d82f1a6451fc9c1f7e3a4017bdc1d13bc58
author Alex Deymo <deymo@google.com> 1443758268 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443758268 +0000

am f9bd3d82: am 35907067: am e89dd69c: Merge "Pack META/ab_partitions.txt when using the A/B OTA updater."

* commit 'f9bd3d82f1a6451fc9c1f7e3a4017bdc1d13bc58':
  Pack META/ab_partitions.txt when using the A/B OTA updater.