| commit | 2343f905e7a0766409ffd754672f2d5853e53891 | [log] [tgz] |
|---|---|---|
| author | Paul Westbrook <pwestbro@google.com> | Sun Nov 02 18:58:54 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Nov 02 18:58:54 2014 +0000 |
| tree | 7ab64ee6c24565fbc3de950a06a3575fbcd33b6b | |
| parent | 04dbefaf34faa384eb6115bd562a468042258cea [diff] | |
| parent | 6e98331b75de2447bbca26558074dd1190966b29 [diff] |
am 6e98331b: resolved conflicts for merge of 6c093b62 to lmp-sprout-dev * commit '6e98331b75de2447bbca26558074dd1190966b29': Use link to linkify account settings