| commit | 38cc8c36c47a64da8fec0f502e98475f74372117 | [log] [tgz] |
|---|---|---|
| author | Evgeniy Stepanov <eugenis@google.com> | Sat May 30 01:28:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat May 30 01:28:36 2015 +0000 |
| tree | 63adaa850e36e9e67b10c4dc07edac49dd5fb9a1 | |
| parent | c9a83239ef91c56afea3075405f80c0b0189b3c9 [diff] | |
| parent | 6857a4242fac3f4fc98201e35b7d05e3bb031578 [diff] |
am 5788769d: Merge "Revert "Fix ODR issues in ART."" * commit '5788769ddcb9ab33a36fdf4d078f90a4ef022d8d': Revert "Fix ODR issues in ART."