commit | bc72a54073054aa3a972a6f527c732d9ad000fc7 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Tue May 10 16:03:51 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue May 10 16:03:51 2016 +0000 |
tree | 1d2eff355f46b3d2e96aa6109fb90ed339cc9b7f | |
parent | b3180e43c05f10f5957765875981fb350d5021df [diff] | |
parent | 23e1312720c45944646f68379c1f15fcd8434da8 [diff] |
Merge "<cutils/atomic.h> has been inlined for two years now." am: c5016de66b am: 23e1312720 * commit '23e1312720c45944646f68379c1f15fcd8434da8': <cutils/atomic.h> has been inlined for two years now. Change-Id: Ia4205030c07494149b8392abf74ec29ebd463724