tree 946d66b8b9fa13c3065d4494ad856298e2270337
parent e9390679c91a297acf06cb80e27f1840fb96e7c9
parent 52e2a97aa78898f9d9bf2ee887f2c3363e29c87b
author Tianjie Xu <xunchang@google.com> 1478638674 +0000
committer android-build-merger <android-build-merger@google.com> 1478638674 +0000

Merge "Make make_parent() to take const argument"
am: 52e2a97aa7

Change-Id: Ia4d597510cf99ade837a9c6a33b19788b8cf2291