tree 5df1d84781ca9de96c88d1007a6bc82d568d48c3
parent fbfe455d485fd3fc7a5476260c4cc5e068bf1498
parent 84ee94f77c769adffddd6111c8986c6873e932ab
author Jordan Liu <jminjie@google.com> 1515700738 +0000
committer android-build-merger <android-build-merger@google.com> 1515700738 +0000

Merge "Add unit tests to verify EDITED preservation" am: 752067ed01
am: 84ee94f77c

Change-Id: Iba8941aabfa83c1ad7b9eb48d7db9e253fc57fc3