7 Commits

Author SHA1 Message Date
Jesse Wilson
9c5cacc71a Format NaN and Infinity as Doclava expects.
Change-Id: I500e049132b3254e3b78e08c1875e0dc451b70b6
2011-09-28 17:04:52 -04:00
Dianne Hackborn
d9fe0a1c88 am 229ff64b: am 351ddeb2: am 5db9ff97: Update final 13 API def.
* commit '229ff64bde1f8ffeb23a305178a7f6a57bffe1e5':
  Update final 13 API def.
2011-06-27 17:13:16 -07:00
Dianne Hackborn
5db9ff97aa Update final 13 API def.
Change-Id: I90cb38f575dd1b92a3694bb5cd091f5d595cee11
2011-06-27 15:09:40 -07:00
Dianne Hackborn
f7f413e118 am 0a63ccc6: am 5624b793: am 2bb2d48f: Commit final (maybe) MR 2 API.
* commit '0a63ccc63b833e8034cc941bf55a6e2003037309':
  Commit final (maybe) MR 2 API.
2011-06-10 14:08:49 -07:00
Dianne Hackborn
2bb2d48f9c Commit final (maybe) MR 2 API.
Change-Id: I42f72819a29d4ac7902b7be5af0b5d353d790eae
2011-06-09 19:22:05 -07:00
Brian Carlstrom
a7284f0e72 Tracking merge of dalvik-dev to master
Adapt to change in the way MockWebServer sets up CONNECT proxies.
  git cherry-pick --no-commit c7e2feee5e7908a019a0de91123c1feb9bdc38bc

React to move of Base64 in libcore
  git cherry-pick --no-commit 119f7ebdd1f8df3a8ff8e3b8056bff725d569253

Expose and document android.net.HttpResponseCache.
  git cherry-pick --no-commit 7b73f0fdb8c032a65c55610541d66385bd8bcbe6)

make update-api

Change-Id: Ieb48b304ea38ee8c2ec01e860d99b1404583889e
2011-05-27 01:21:50 -07:00
Dianne Hackborn
a8138732a0 MR2 is going to be API 13.
Change-Id: I05b65ace073b8731e85b41ac4ae63e2745cb46b5
2011-05-12 16:26:47 -07:00