tree 0b4e061b29b9b3801f6d162cda6d5a9fff41ecd1
parent e04fd5375c3a26dfc92854f99889e07ff6ef1d87
parent 260573b3c2bb8ae14d51616695bed578055b1cad
author Tianjie Xu <xunchang@google.com> 1478639303 +0000
committer android-build-merger <android-build-merger@google.com> 1478639303 +0000

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

Change-Id: Icc898211217bf9ecfcefba02ecc96be17b636579