tree ab74ceb39d0ce7ee6e4503e62f6f068be13de7b5
parent de44c0937c5a3c2f45c2346a4a5754e228db473b
parent e1c9e1663c6edb769964e9274630da566fb22cfc
author Dan Albert <danalbert@google.com> 1475776488 +0000
committer android-build-merger <android-build-merger@google.com> 1475776488 +0000

Merge changes from topic 'libOpenMAXAL-ndk_library' am: 8924e901a8
am: e1c9e1663c

Change-Id: I320d23d613bccedae64fa12eaef3b7f91743e648