commit | cb1d50caa73495c104509afab42c70734385eddb | [log] [tgz] |
---|---|---|
author | Steven Moreland <smoreland@google.com> | Thu Jul 06 23:54:46 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 06 23:54:46 2017 +0000 |
tree | 8d12e96fe9b904fb9c6cb23833260a8cef54c0e6 | |
parent | bf5ac7186dbb15ad1400ace658bdce9283e85735 [diff] | |
parent | 9292242b8d2b26b6acbe1312bdd449a739bc838b [diff] |
Merge "Merge "Add explicit nativebridge header dependency to art test." am: 6d2e76b421 am: a07e234fc7" into oc-dev-plus-aosp am: 9292242b8d Change-Id: Ic81aae69fe39d0e8f9b737e87b687fa6d51e4951