summaryrefslogtreecommitdiffstats
path: root/core/java/com
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-07-18 09:36:48 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-07-18 09:36:48 -0700
commit03a152d7e72f05456a463f2709ce787119e86f03 (patch)
treec07b36ddc2a06652a145f79e55f22e46aeebe8e8 /core/java/com
parent42658ed5182a75b82dd2b970a1f97fc30407d1e3 (diff)
parent15cb526ece1420b1ae2061e20fd0982d82b41aae (diff)
downloadframeworks_base-03a152d7e72f05456a463f2709ce787119e86f03.zip
frameworks_base-03a152d7e72f05456a463f2709ce787119e86f03.tar.gz
frameworks_base-03a152d7e72f05456a463f2709ce787119e86f03.tar.bz2
am 15cb526e: Merge "Fix import after okhttp update."
* commit '15cb526ece1420b1ae2061e20fd0982d82b41aae': Fix import after okhttp update.
Diffstat (limited to 'core/java/com')
0 files changed, 0 insertions, 0 deletions