| commit | 435640312ce48dab201d6f26a6258143a82f551e | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jul 11 19:01:36 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 11 19:01:36 2013 -0700 |
| tree | ddc2ff56c3d8065c0b8f1ee37498cb9a03f51c68 | |
| parent | dccd77730754b681f3517308359a34f86aecd99f [diff] | |
| parent | 7b9c33b1e0e47f72d0af35d8a948900697da5871 [diff] |
am 7b9c33b1: Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8. * commit '7b9c33b1e0e47f72d0af35d8a948900697da5871': Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8.