tree 0b4e061b29b9b3801f6d162cda6d5a9fff41ecd1
parent a1c121e03449db93b4c58a28494cd2bb12bdd7be
parent 1fd9f0aff7bbc1ca34835fdba6223dc9ee643bc8
author Tianjie Xu <xunchang@google.com> 1478639005 +0000
committer android-build-merger <android-build-merger@google.com> 1478639005 +0000

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

Change-Id: I5ce1d09108c90e3a800942653777c374a302449a