tree c359caff137213fc54ca2adc147160a0d158dce6
parent b2a38b1ced15ea499cd5ec71c5f2fbfbc7a86375
parent 865c5fef38177abfb822411708ee3b9416fbee18
author Winston Man <hkman@google.com> 1508036892 +0000
committer android-build-merger <android-build-merger@google.com> 1508036892 +0000

Merge "Update CtsShim with multiArch" into oc-mr1-dev am: 0d2d6b6a86
am: 865c5fef38

Change-Id: I6691bb658052abcd3c8332019558b056312acb8c