| commit | 6b78fad147c772075eae5cfc25f5a50748bc4015 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jul 11 19:10:01 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 11 19:10:01 2013 -0700 |
| tree | baed3837841e73b6a4f7229c5ddda96149752196 | |
| parent | 435640312ce48dab201d6f26a6258143a82f551e [diff] | |
| parent | a9396549b37d13c518c662c04f6ff42e9ae47c24 [diff] |
am a9396549: Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8 harder. * commit 'a9396549b37d13c518c662c04f6ff42e9ae47c24': Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8 harder.