commit | 76df2d6d1df802a97b383092f9563cd0ef6392ee | [log] [tgz] |
---|---|---|
author | Mathieu Chartier <mathieuc@google.com> | Thu Jul 06 22:40:24 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 06 22:40:24 2017 +0000 |
tree | 4b70492bef70da034120aba92e47321cd754f72d | |
parent | 3710ad53d7308f71884051b364b10e53985abbe8 [diff] | |
parent | bebcc339f0150375456a6c9d22c13c85ec5561eb [diff] |
Merge "Merge "Merge "Avoid cross compilation error in DoCallCommon" am: 22ae7b3b3b" into stage-aosp-master am: d0b2a8c52e" into oc-dev-plus-aosp am: bebcc339f0 Change-Id: I57e6d9213430d75fbcfc6713d45fc0776d6df7eb