| commit | c74cd3092397bbdc943ddc61cf2f67b6b4aee1e5 | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@android.com> | Mon Sep 27 16:31:56 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 27 16:31:56 2010 -0700 |
| tree | ddc5aca3aaa9a9e29784ad2de455e87b49c8aa29 | |
| parent | 0717235eb5a5b761f3549f1c2b8c94019b9d6220 [diff] | |
| parent | 52c31d041432a42cc5e5649df6b01ca48843e94f [diff] |
am 52c31d04: (-s ours) am 7bc0e8e2: (-s ours) DO NOT MERGE Cts Feature/Profile Annotations Merge commit '52c31d041432a42cc5e5649df6b01ca48843e94f' into gingerbread * commit '52c31d041432a42cc5e5649df6b01ca48843e94f': DO NOT MERGE Cts Feature/Profile Annotations