| commit | f52823b0536aa689258ad9449eb969e53daa6339 | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Mon Jul 14 20:51:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 14 20:51:44 2014 +0000 |
| tree | 3dc5aaa74f1272c357d339c3c61d7e1ed0aececf | |
| parent | 5587f23f01ac10f5d1db421846c41f9d263aabb4 [diff] | |
| parent | 280ee3a640ed7e7aa36dbbf29d52c61fa9d812e8 [diff] |
am 280ee3a6: am 433df2a5: am b88f433c: am af4cf5d7: Merge "Missed use of android_atomic and thread state_." * commit '280ee3a640ed7e7aa36dbbf29d52c61fa9d812e8':