tree b4ead57321f041f58423f4ff04a82bf89c384f08
parent 31000a40112f935fb47b7b770c89c353638b36bb
parent 1f639435da6d9f5402c95f5c2e68b24ab4a67eb7
author Calin Juravle <calin@google.com> 1491525420 +0000
committer android-build-merger <android-build-merger@google.com> 1491525420 +0000

Merge changes from topics 'seinfo', 'public_dex' into oc-dev
am: 1f639435da

Change-Id: I02a2f1b5aef05f91d3766f28e2394b3091fcc1a1