tree 31c6838ae28e70fceb2fd70d528d6cc0ffb449ed
parent bd6a37e88f8b32fc3cb62c1ace83aa16546c0981
parent 36a32cd68365b8cefea7669ed925cf5387a3b53a
author Joe Fernandez <joefernandez@google.com> 1403381793 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403381793 +0000

am 36a32cd6: resolved conflicts for merge of 9560aaec to klp-modular-dev

* commit '36a32cd68365b8cefea7669ed925cf5387a3b53a':
  Removing old, duplicate developer.android.com server configuration