tree b50adfbb125d7652719820a61b2cd0d02b8d4ddb
parent da0f2b2adf7b7d51eacb724fc67c86e27370177a
parent cd3513c8dd3fdda08faa0f3935767cad45c796ec
author Tianjie Xu <xunchang@google.com> 1478639634 +0000
committer android-build-merger <android-build-merger@google.com> 1478639634 +0000

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

Change-Id: I3244b7ff4f67a04b34c3531caae49bb50dc4917f