| commit | fb0c02e7271b3eb945e353dbcf83edf173a9b40d | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@android.com> | Mon Sep 27 16:35:51 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 27 16:35:51 2010 -0700 |
| tree | 0422f3db33932997a0727e7a532e7fc7852a9de3 | |
| parent | 61fc13f17c3622fc1ccda42dc20f1a758b5cb9f4 [diff] | |
| parent | c74cd3092397bbdc943ddc61cf2f67b6b4aee1e5 [diff] |
am c74cd309: am 52c31d04: (-s ours) am 7bc0e8e2: (-s ours) DO NOT MERGE Cts Feature/Profile Annotations Merge commit 'c74cd3092397bbdc943ddc61cf2f67b6b4aee1e5' into gingerbread-plus-aosp * commit 'c74cd3092397bbdc943ddc61cf2f67b6b4aee1e5': DO NOT MERGE Cts Feature/Profile Annotations