tree 5e14378c06f32d33d76d2a1032f8c5ab46100c00
parent b78da2859dd3792fcb989b5f83996e4206d8510a
parent a2fe8c139429b29caaa6503948cfb0d8e623a28f
author Stephen Hines <srhines@google.com> 1463673658 +0000
committer android-build-merger <android-build-merger@google.com> 1463673658 +0000

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

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

Change-Id: I2a8f2c2442445800f9a397b4b099ff799d558adb