tree 36ca805faeb73f90ef9ff38a08693bc22b9fa7db
parent ce273568135b781eb56fddee8b52453bb9551a54
parent 968853c765be396189f6bb682c14a6152189ab02
author Ting-Yuan Huang <laszio@google.com> 1506021919 +0000
committer android-build-merger <android-build-merger@google.com> 1506021919 +0000

Merge "Fix reduce_allocation()." am: 7d845bafe5 am: c32774f81e
am: 968853c765

Change-Id: I4df82170e4d9f4661ae1ef8df384cc45dd6e6920