tree 4746c3c5c1dc3e5bcfffad6c40c602b6ca3c44c7
parent cfb21b2be325cd78e799f645ca161db3c64a5a9c
parent 4f5e8cc3ca6da83f11bf42d04f1a57b9af16a582
author Ying Wang <wangying@android.com> 1446076978 +0000
committer android-build-merger <android-build-merger@google.com> 1446076978 +0000

Merge "Normalize the product makefile path in inherit-product." am: aabff90bfe am: 3482ea54a2
am: 4f5e8cc3ca

* commit '4f5e8cc3ca6da83f11bf42d04f1a57b9af16a582':
  Normalize the product makefile path in inherit-product.