commit | 6782274c46f4ed1d4f1e80f2e9e1c54d3ed9ad98 | [log] [tgz] |
---|---|---|
author | Mathieu Chartier <mathieuc@google.com> | Thu Jul 06 22:41:05 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 06 22:41:05 2017 +0000 |
tree | 4b70492bef70da034120aba92e47321cd754f72d | |
parent | 76df2d6d1df802a97b383092f9563cd0ef6392ee [diff] | |
parent | 5482c6cc39f28fa9f3664dfb359841ef07f92e8a [diff] |
Merge "Merge "Merge "Avoid cross compilation error in DoCallCommon" am: 22ae7b3b3b" into stage-aosp-master am: d0b2a8c52e" into oc-dev-plus-aosp am: 5482c6cc39 Change-Id: I8aba7ee90285997b9b56b266ca397ee1caeb7a67