| commit | 52c31d041432a42cc5e5649df6b01ca48843e94f | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@android.com> | Mon Sep 27 16:16:38 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 27 16:16:38 2010 -0700 |
| tree | d2d685e841438776f9fcc6dc6d97aff05f226ebc | |
| parent | 8c2a6b742ef85d4fd32ce5abff21483262bea2b1 [diff] | |
| parent | 7bc0e8e2367cc49b0ce8f1fdef3937f9129bd3b8 [diff] |
am 7bc0e8e2: (-s ours) DO NOT MERGE Cts Feature/Profile Annotations Merge commit '7bc0e8e2367cc49b0ce8f1fdef3937f9129bd3b8' into froyo * commit '7bc0e8e2367cc49b0ce8f1fdef3937f9129bd3b8': DO NOT MERGE Cts Feature/Profile Annotations