| commit | a2e5edd08f0dae0ff04b2dcae5f7b18d10e0eae1 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Wed Nov 05 20:21:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 05 20:21:44 2014 +0000 |
| tree | 19ecb96306c90be1b82bc26e9b8c04c559aa91a2 | |
| parent | 80fd257094a12f3e8a33027e28c04f5e25ab47e5 [diff] | |
| parent | be3ac2a80b3607220a118abeb2dd0678f722af2c [diff] |
am be3ac2a8: am 59701b9b: resolved conflicts for merge of 97014933 to stage-aosp-master * commit 'be3ac2a80b3607220a118abeb2dd0678f722af2c': Fix a wonderful copy/paste time bomb.