| commit | dadf7c378e059d6f2e2ebb4bf6d6569eaea94dbe | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Fri Sep 03 14:13:09 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 03 14:13:09 2010 -0700 |
| tree | 79e94621be2e5fedd368b016d14c6416e57c89c4 | |
| parent | d4ff0b733957a6c4ec52b30218dbea320c1bd78c [diff] | |
| parent | 1cc3202d0e6b888b59a1d73039f73213c4a72849 [diff] |
am 1cc3202d: am 2d5cd1df: Follow rename. Merge commit '1cc3202d0e6b888b59a1d73039f73213c4a72849' * commit '1cc3202d0e6b888b59a1d73039f73213c4a72849': Follow rename.