Stephen Hines b6b17a575f resolved conflicts for merge of 764f08ad to master ...

Change-Id: I0a22225b2d26b6d806de2dcc70ffba29c96865b3

2015-04-07 14:47:32 -07:00

..

java

resolved conflicts for merge of 764f08ad to master

2015-04-07 14:47:32 -07:00

jni

Merge "Load libraries directly from apk"

2015-04-07 17:28:15 +00:00

res

am aa94389b: am d95e58cb: Merge "Load libraries directly from apk"

2015-04-07 17:57:03 +00:00

tests

Load libraries directly from apk

2015-04-07 17:25:23 +00:00