tree 5e14378c06f32d33d76d2a1032f8c5ab46100c00
parent cc3c280931ee732af39d260444b42aa57d950123
parent 4b1a73563f274c67ee3f65ecada97fedccb12e42
author Stephen Hines <srhines@google.com> 1463673464 +0000
committer android-build-merger <android-build-merger@google.com> 1463673464 +0000

Merge "Merge aosp/dev cherry-picks (for MIPS ASan) into aosp/master."
am: 4b1a73563f

* commit '4b1a73563f274c67ee3f65ecada97fedccb12e42':
  Merge aosp/dev cherry-picks (for MIPS ASan) into aosp/master.

Change-Id: If89d9d5a58ef867212c6b16ca7ca5dabedcdcb02