tree 9db60e80cdc0f9342bf102ec141c68d010bd3dc9
parent 5719789248999c512bb3a28032c7c7fb090d1845
parent 3f076da22ba5bf8bff457019714cf7aa683d9c79
author Christian Wailes <chriswailes@google.com> 1548295978 -0800
committer android-build-merger <android-build-merger@google.com> 1548295978 -0800

[automerger skipped] Merge "Implemented native functions and types for blastula management." am: 5222bf368b am: c5cc5e525c
am: 3f076da22b -s ours
am skip reason: change_id I12cd9f2c87a2e3c00d64b683edf3631e29a51551 with SHA1 aa1c962ded is in history

Change-Id: Id3408faeecfc203d89b6225790eceda530362fb3