| commit | e5aeaebefa643e0604b1c907273964d022e4e257 | [log] [tgz] |
|---|---|---|
| author | Jean Chalard <jchalard@google.com> | Mon Sep 24 09:36:33 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 24 09:36:33 2012 -0700 |
| tree | 2a9504d63748541cc7bd2dd1fe426f747a89beaf | |
| parent | e6f4d070a78fb9e7e1a51ef8030d73e0c04b02c7 [diff] | |
| parent | 57fc12adb39ec2391f588c4b8507d3f17e4979f5 [diff] |
am 57fc12ad: am 65ef2608: Merge "Fix a race condition with shift" into jb-mr1-dev * commit '57fc12adb39ec2391f588c4b8507d3f17e4979f5': Fix a race condition with shift