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