tree 8a2b533ac8293f510189ee8184d023f73f03fb37
parent b9b84920ba47ddf7f15baa01c56b28e3d3f951ea
parent 8d6d0f77cb2e7520f6650781c643dd4120c956e6
author Colin Cross <ccross@android.com> 1509063831 +0000
committer android-build-merger <android-build-merger@google.com> 1509063831 +0000

Merge "Convert external/jsilver to Android.bp" am: d7fb8234af am: c1514dce6b
am: 8d6d0f77cb

Change-Id: I6d7ac05028b87105ed703bea98d89bd471550fb2