tree 21280ae4cb21c0ef789e3394d690b5e4a52a3ae4
parent 0e677b426d9e1456ba68ca174b62ccaaa44d14b4
parent 6a0451f4e15a725ed302acfed5f5ad40f8ee9e72
author Tao Bao <tbao@google.com> 1470948763 +0000
committer android-build-merger <android-build-merger@google.com> 1470948763 +0000

Merge "releasetools: Update the path to /default.prop for A/B devices." am: 6d64ff1bf7 am: 6eb5564025 am: cd6ce6182b
am: 6a0451f4e1

Change-Id: I3700ae08d2fca2301e4d04bb21adf6a8b5457ec6