tree 6830d525f5c002fff9a23fe08ec89fa3a96b808e
parent 1d5db01147d7a0e924ca2058b66f2c932498b0a5
parent f30396c14e62e8de42e82f4893ad1915016749f7
author SzuWei Lin <szuweilin@google.com> 1518415652 +0000
committer android-build-merger <android-build-merger@google.com> 1518415652 +0000

Merge "Support mounting the odm image" am: 8337ffeae2 am: 08d6d9604a
am: f30396c14e

Change-Id: I56f52d6d3578dda685136b8d92b43b6400308d1c