tree 9ede1428df33581fc52af2fd57d92d491b33fb84
parent cf81de2b0dba802c7220121ba65ee5ca5a69b161
parent b1bc7c18748eeab0d08a0660d86917dad7bf1e2d
author Jason Monk <jmonk@google.com> 1400590791 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1400590792 +0000

Merge "Fix reference to ProxyInfo extra"