tree f00e90aa8bed17d60362268e96f2e43f7dee3c8f
parent dd5ff6664ed7f332bfc6c48e73c0a735169975d1
parent 2a02f18cf1bef68626a4849fa38c02553f3c747a
author Marco Nelissen <marcone@google.com> 1476457249 +0000
committer android-build-merger <android-build-merger@google.com> 1476457249 +0000

Merge "Fix issues with metadata handling when format change happens" am: 92047ec34b am: d41a64c7ad
am: 2a02f18cf1

Change-Id: Ia945c856b0b805111ebcb5a93908934ddaa78db1