tree 13f05ab5e2d3782ce75605fd43b4915613e69b8b
parent d61111ff8dd2e32289fffe4e42cd496609952bc0
parent ef3c62dd7297daef29187ff0363dffff4f1c78b1
author Christopher Ferris <cferris@google.com> 1495262152 +0000
committer android-build-merger <android-build-merger@google.com> 1495262152 +0000

Merge "Fix missing function export." am: 8433d40f56
am: ef3c62dd72

Change-Id: I7256cad109c80ca48408ca5a92ab32adde332413