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