| commit | 9b60acdb52c87a92bc35d77e84bb88fdc63ee5c4 | [log] [tgz] |
|---|---|---|
| author | Andy McFadden <fadden@android.com> | Tue Nov 27 17:34:20 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 27 17:34:20 2012 -0800 |
| tree | b847b48d6b2f5db08c74201e7a1bc0f27eba3704 | |
| parent | 333fb7975302f820a1e5377f460f259a92dd1fae [diff] | |
| parent | db2e4f16bb1c804414773862030cdb0aa5413778 [diff] |
am db2e4f16: (-s ours) am a90173d8: am 762a6d86: Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev * commit 'db2e4f16bb1c804414773862030cdb0aa5413778': DO NOT MERGE - native_fence_sync: fix an enum name