tree 995ca804b4d9d8796cc5cf181290bb2d43471bba
parent 25222bf623d513f2487c1ee17aae8cf592318bc6
parent 153d0953fe0df254bf3ffaa56934c97020b86edb
author Brian Carlstrom <bdc@google.com> 1344620139 -0700
committer android code review <noreply-gerritcodereview@google.com> 1344620139 -0700

Merge "Add makefile + jarjar rule for okhttp."