tree b80e70b1fa5f34e05aca5b5f4c5ecd4afe96936a
parent 5c16219854c129f07179be9c1cc1dbcf2221d3a0
parent 619e1dbb66aabb7836ffb9d727f4be454fe24d78
author Colin Cross <ccross@android.com> 1472750347 +0000
committer android-build-merger <android-build-merger@google.com> 1472750347 +0000

Merge "Canonicalize mmm path" am: a5b02ff1ef
am: 619e1dbb66

Change-Id: I2906fb3ee2a459a0e648bbc77d944e621feb88fc