commit | 23e1312720c45944646f68379c1f15fcd8434da8 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Tue May 10 16:01:20 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue May 10 16:01:20 2016 +0000 |
tree | 0d1c871a88f44a323d033ab8f86592e7f87acd5d | |
parent | 1a3ac02e4c765c54577233662d121c02f4fc919d [diff] | |
parent | c5016de66b6d778dd7c292e215aad6b5c079e92c [diff] |
Merge "<cutils/atomic.h> has been inlined for two years now." am: c5016de66b * commit 'c5016de66b6d778dd7c292e215aad6b5c079e92c': <cutils/atomic.h> has been inlined for two years now. Change-Id: Icc28b866c2dd081d1047263c7cfaea05d20975f6