tree 2cb9d3c69d121011cd51682c669252bc70fc028b
parent 3faac31eb1d7ac694b21a61e3a3cefcae035b4b1
parent 89accf7e19d63bea73b744cf4fdf27ba8af48fd7
author Colin Cross <ccross@android.com> 1495043411 +0000
committer android-build-merger <android-build-merger@google.com> 1495043411 +0000

Merge "Convert libmediandk to Android.bp" am: 77c52d2f58 am: f90158f892
am: 89accf7e19  -s ours

Change-Id: If4079984d233bb64ed97e80d9bc6cecf94b5c7f2