commit | 572f84601aac1fa1cee4789fd709c90509d7c4c6 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Tue May 10 16:09:29 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue May 10 16:09:29 2016 +0000 |
tree | 9600119b89bfbeffb53eff42f1a4f50d13a9e503 | |
parent | 9d28c807f255a12e8dcad0e4634a48e6b66fc0ed [diff] | |
parent | 78d844b5e7a0129c7541cc1dea22cbef249bbf9b [diff] |
Merge "<cutils/atomic.h> has been inlined for two years now." am: c5016de66b am: 23e1312720 am: bc72a54073 am: 3b7c8b98dc * commit '3b7c8b98dcbc3e75ce4b40a74efe7862cb361aa8': <cutils/atomic.h> has been inlined for two years now. Change-Id: I447255900e346d051a270c16019c7b1b3c931139