| commit | 7d8490eb734307eeffea4734697701fd20cff26e | [log] [tgz] |
|---|---|---|
| author | Hans Boehm <hboehm@google.com> | Mon Jul 14 17:59:57 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 14 17:59:57 2014 +0000 |
| tree | 83134f2dcaef18e8ffddd3c3a11e868497ac9dac | |
| parent | e60eb623845b6809657b18ea068a0b93f052fa0c [diff] | |
| parent | 0de8ac248a8a31c4baa4c1b9ab9dd08d8bdaaecb [diff] |
am 0de8ac24: am e6b0c566: am 981dcd79: Merge "Add comment to discourage use of cutils/atomic.h." * commit '0de8ac248a8a31c4baa4c1b9ab9dd08d8bdaaecb': am e6b0c566: am 981dcd79: Merge "Add comment to discourage use of cutils/atomic.h."