| commit | 7b7feee3cbb4a859c87f644e260160902ca52d61 | [log] [tgz] |
|---|---|---|
| author | Joe Fernandez <joefernandez@google.com> | Sat Jun 21 20:16:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jun 21 20:16:33 2014 +0000 |
| tree | 31c6838ae28e70fceb2fd70d528d6cc0ffb449ed | |
| parent | bd6a37e88f8b32fc3cb62c1ace83aa16546c0981 [diff] | |
| parent | 36a32cd68365b8cefea7669ed925cf5387a3b53a [diff] |
am 36a32cd6: resolved conflicts for merge of 9560aaec to klp-modular-dev * commit '36a32cd68365b8cefea7669ed925cf5387a3b53a': Removing old, duplicate developer.android.com server configuration