| commit | edb719c9bad7e2535b4af0ac5c0ef66f71e648ae | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <ed@google.com> | Thu Jul 26 08:15:30 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 26 08:15:30 2012 -0700 |
| tree | 365346b4c877d12cf28507fb6c538bf130e4effe | |
| parent | 1918e8271f4ca9a2a9686c5f5ff01653522e58d6 [diff] | |
| parent | bf29b8cdd643947579b94911d387fbbf66f2096c [diff] |
am bf29b8cd: am 3551e3cc: am 8165f0dd: resolve conflicts w/4f174f1d27adbde6f50e11ee3a8eaf162a030284 * commit 'bf29b8cdd643947579b94911d387fbbf66f2096c':