95462 Commits

Author SHA1 Message Date
Joe Fernandez
2c824c21aa am ad070e0c: am 1d7ac400: am bb3f2b9c: am 15de1aa9: Merge "docs: NDK r8e Release Notes" into jb-mr1.1-docs
* commit 'ad070e0c360fd6f02b6f6f128b42b89251449a62':
  docs: NDK r8e Release Notes
2013-03-20 15:28:48 -07:00
Joe Fernandez
ad070e0c36 am 1d7ac400: am bb3f2b9c: am 15de1aa9: Merge "docs: NDK r8e Release Notes" into jb-mr1.1-docs
* commit '1d7ac400064c90937bd322f66970a66b548c5025':
  docs: NDK r8e Release Notes
2013-03-20 15:26:37 -07:00
kmccormick
ccc7841d09 am 72d4a56d: am 4e8453b5: am d42b977a: am 5640b829: Merge "Doc Update: GCM cleanup" into jb-mr1.1-docs
* commit '72d4a56d827a8fd256adde3ac013f013fe497deb':
  Doc Update: GCM cleanup
2013-03-20 15:25:16 -07:00
Joe Fernandez
1d7ac40006 am bb3f2b9c: am 15de1aa9: Merge "docs: NDK r8e Release Notes" into jb-mr1.1-docs
* commit 'bb3f2b9cf47b865613efc1045e6a982fe853ade8':
  docs: NDK r8e Release Notes
2013-03-20 15:24:10 -07:00
kmccormick
72d4a56d82 am 4e8453b5: am d42b977a: am 5640b829: Merge "Doc Update: GCM cleanup" into jb-mr1.1-docs
* commit '4e8453b5b5f75e74acdeb5e528b5166bc6a4f5b8':
  Doc Update: GCM cleanup
2013-03-20 15:23:11 -07:00
Joe Fernandez
bb3f2b9cf4 am 15de1aa9: Merge "docs: NDK r8e Release Notes" into jb-mr1.1-docs
* commit '15de1aa94d5222dc6ae35f148bfa514218f60a07':
  docs: NDK r8e Release Notes
2013-03-20 15:21:45 -07:00
kmccormick
4e8453b5b5 am d42b977a: am 5640b829: Merge "Doc Update: GCM cleanup" into jb-mr1.1-docs
* commit 'd42b977aacfba6646edb5331d9321ad1f02c7258':
  Doc Update: GCM cleanup
2013-03-20 15:20:45 -07:00
kmccormick
d42b977aac am 5640b829: Merge "Doc Update: GCM cleanup" into jb-mr1.1-docs
* commit '5640b8293cecf4c060c8847559bd017826d03180':
  Doc Update: GCM cleanup
2013-03-20 15:18:11 -07:00
Joe Fernandez
15de1aa94d Merge "docs: NDK r8e Release Notes" into jb-mr1.1-docs 2013-03-20 22:17:35 +00:00
kmccormick
5640b8293c Merge "Doc Update: GCM cleanup" into jb-mr1.1-docs 2013-03-20 22:14:12 +00:00
kmccormick
510f69b310 Doc Update: GCM cleanup
Bug # 8144337, 8289556, 8289952, 7579225

Change-Id: Ibfc4a703a89572525b75e71ac2b5392c41bd1733
2013-03-20 14:52:33 -07:00
Joe Fernandez
603dbd7853 docs: NDK r8e Release Notes
Change-Id: Id06bf788d631cccc69964cdef400a7e472060c4a
2013-03-20 14:35:29 -07:00
Scott Main
8efa65b183 am be83b5a7: am 7df36bc8: am f2162147: am 6dbb6788: delete some obsolete links
* commit 'be83b5a72ffaf3ed91e9341340c0c0477005f538':
  delete some obsolete links
2013-03-19 18:38:05 -07:00
Scott Main
be83b5a72f am 7df36bc8: am f2162147: am 6dbb6788: delete some obsolete links
* commit '7df36bc872e64b330d2a801adafee52e14112ec9':
  delete some obsolete links
2013-03-19 18:36:15 -07:00
Scott Main
7df36bc872 am f2162147: am 6dbb6788: delete some obsolete links
* commit 'f2162147c1dd8bd027a01f660108d214174379b5':
  delete some obsolete links
2013-03-19 18:35:01 -07:00
Scott Main
f2162147c1 am 6dbb6788: delete some obsolete links
* commit '6dbb6788b9ea32f36f6653fe48a0e00179540555':
  delete some obsolete links
2013-03-19 18:32:33 -07:00
Scott Main
6dbb6788b9 delete some obsolete links
Change-Id: I1495295caa878c55536e60e84caf358d80705507
2013-03-19 18:27:50 -07:00
Elliott Hughes
c1562075b0 am ebebb80b: Merge "Remove dead code from DateUtils."
* commit 'ebebb80b4a629756128b5a4fcf483133f01dbfd7':
  Remove dead code from DateUtils.
2013-03-19 12:24:50 -07:00
Elliott Hughes
ebebb80b4a Merge "Remove dead code from DateUtils." 2013-03-19 18:45:54 +00:00
Elliott Hughes
9a6fa1d637 Remove dead code from DateUtils.
This stuff is @hide, @deprecated, unused, and was never in any API level.

Change-Id: I87d132d77d7296a2de8527e05c2def362cab1c37
2013-03-19 11:36:12 -07:00
Elliott Hughes
c9fe40ead5 am 71558f1f: Merge "Fix times in debugging output to use H rather than k."
* commit '71558f1fafa29fe993ab0556bbaee6530f3930d7':
  Fix times in debugging output to use H rather than k.
2013-03-19 10:11:19 -07:00
Elliott Hughes
71558f1faf Merge "Fix times in debugging output to use H rather than k." 2013-03-19 16:50:39 +00:00
Elliott Hughes
bab316fea2 am e79af7df: Merge "Fix build."
* commit 'e79af7dffbd4c41ab756c5b0888e28bbb317aab3':
  Fix build.
2013-03-18 18:55:42 -07:00
Elliott Hughes
54519e7041 Fix build.
(cherry-pick of 0a65ac90fae79687b46a8e70549204b97e4c951f.)

Change-Id: Idd0feede5bf5ce78f47f9a442019e68f7717a9e4
2013-03-18 18:17:25 -07:00
Elliott Hughes
e79af7dffb Merge "Fix build." 2013-03-19 01:11:02 +00:00
Elliott Hughes
0a65ac90fa Fix build.
Change-Id: Icb7fb60f00251ab01c8f9844572bb349e45c6c41
2013-03-18 18:10:24 -07:00
Elliott Hughes
eda35cb7c5 am a8974d3f: Merge "Clean up (some of) our many clocks to use H instead of k."
* commit 'a8974d3f0a799a5d76e226649c878a71b3b5e953':
  Clean up (some of) our many clocks to use H instead of k.
2013-03-18 17:49:47 -07:00
Elliott Hughes
64a277d837 Fix times in debugging output to use H rather than k.
Bug: 8359981
Change-Id: I4fccf3ed7e469b77f6e755dacbcd025005390505
2013-03-18 17:47:22 -07:00
Elliott Hughes
a8974d3f0a Merge "Clean up (some of) our many clocks to use H instead of k." 2013-03-19 00:28:42 +00:00
Elliott Hughes
cdafd37f31 Clean up (some of) our many clocks to use H instead of k.
Bug: 8359981
Change-Id: I3c0c38c2bf5adc4b5bdc11c3d10cf41dd8fb6462
2013-03-18 17:21:33 -07:00
Scott Main
da9f385abc am 2e1e8928: am a2f80853: am 49e43bb8: am e21406cb: add search tags for Design patterns
* commit '2e1e892878ea0612d6e2916ec3849cc3f30f5b72':
  add search tags for Design patterns
2013-03-18 16:57:54 -07:00
Scott Main
2e1e892878 am a2f80853: am 49e43bb8: am e21406cb: add search tags for Design patterns
* commit 'a2f808539c13efaf6bb86b607d47dcedd58bb41b':
  add search tags for Design patterns
2013-03-18 16:55:47 -07:00
Scott Main
a2f808539c am 49e43bb8: am e21406cb: add search tags for Design patterns
* commit '49e43bb818d3b8ff5e9c7272d5039b9d2926aac9':
  add search tags for Design patterns
2013-03-18 16:53:56 -07:00
Scott Main
49e43bb818 am e21406cb: add search tags for Design patterns
* commit 'e21406cb963ce00b62cebe14732f1960f877cbec':
  add search tags for Design patterns
2013-03-18 16:52:32 -07:00
Scott Main
e21406cb96 add search tags for Design patterns
Change-Id: I7126bbf88c2160efbca431e3e4caa612abc20bf9
2013-03-18 15:50:55 -07:00
Scott Main
b4b84f6440 am d95cad7c: am 1a7ad2cb: am be06c28e: am 36c27c4a: add search tags to Design building blocks
* commit 'd95cad7c8acd83f50cc0b9567da68f80d454afb0':
  add search tags to Design building blocks
2013-03-18 15:24:56 -07:00
Elliott Hughes
c5c6d4167b am 6317315e: Merge "Deliberately break DateFormat.format\'s formatting of \'k\' for compatibility."
* commit '6317315e733f115aa6ad0339c1a334607fd04342':
  Deliberately break DateFormat.format's formatting of 'k' for compatibility.
2013-03-18 15:24:31 -07:00
Scott Main
d95cad7c8a am 1a7ad2cb: am be06c28e: am 36c27c4a: add search tags to Design building blocks
* commit '1a7ad2cb1284ae7828dda821a6a94d672e8253af':
  add search tags to Design building blocks
2013-03-18 15:22:09 -07:00
Scott Main
1a7ad2cb12 am be06c28e: am 36c27c4a: add search tags to Design building blocks
* commit 'be06c28e733bb2978173dc5dfe5ee9ed0fb9874a':
  add search tags to Design building blocks
2013-03-18 15:19:45 -07:00
Scott Main
be06c28e73 am 36c27c4a: add search tags to Design building blocks
* commit '36c27c4a5eccea944062b38cf70712275f732068':
  add search tags to Design building blocks
2013-03-18 15:17:28 -07:00
Elliott Hughes
6317315e73 Merge "Deliberately break DateFormat.format's formatting of 'k' for compatibility." 2013-03-18 22:07:22 +00:00
Scott Main
36c27c4a5e add search tags to Design building blocks
Change-Id: If23fdd1a29ea9ee5edf20e4b39d512c9b8ba02f5
2013-03-18 15:05:32 -07:00
Elliott Hughes
fc55c2ba49 Deliberately break DateFormat.format's formatting of 'k' for compatibility.
Bug: 8359981
Change-Id: I44ed816c644f94783c77952d544c5444b966868b
2013-03-18 14:59:59 -07:00
Scott Main
0e4071c73b am 426bece0: am e0df1cf8: am 7ff52939: am f82df78b: Merge "add tags to some docs. Training classes from top to bottom of "Connectivity and the Cloud"" into jb-mr1.1-docs
* commit '426bece0d5ebff2b73fce797947406c40b90b133':
  add tags to some docs. Training classes from top to bottom of "Connectivity and the Cloud"
2013-03-18 14:37:56 -07:00
Scott Main
426bece0d5 am e0df1cf8: am 7ff52939: am f82df78b: Merge "add tags to some docs. Training classes from top to bottom of "Connectivity and the Cloud"" into jb-mr1.1-docs
* commit 'e0df1cf883c67e597eca8365bd663a35170d3225':
  add tags to some docs. Training classes from top to bottom of "Connectivity and the Cloud"
2013-03-18 14:36:11 -07:00
Scott Main
e0df1cf883 am 7ff52939: am f82df78b: Merge "add tags to some docs. Training classes from top to bottom of "Connectivity and the Cloud"" into jb-mr1.1-docs
* commit '7ff529393c64e3601f1cd05689d2296c1e35ca02':
  add tags to some docs. Training classes from top to bottom of "Connectivity and the Cloud"
2013-03-18 14:34:23 -07:00
Scott Main
7ff529393c am f82df78b: Merge "add tags to some docs. Training classes from top to bottom of "Connectivity and the Cloud"" into jb-mr1.1-docs
* commit 'f82df78b3534b0ffde83fe83bdb798d3bb7ab780':
  add tags to some docs. Training classes from top to bottom of "Connectivity and the Cloud"
2013-03-18 14:31:43 -07:00
Scott Main
f82df78b35 Merge "add tags to some docs. Training classes from top to bottom of "Connectivity and the Cloud"" into jb-mr1.1-docs 2013-03-18 21:29:18 +00:00
Craig Mautner
7f7ac5b4a8 am fda1bff8: Merge "Correct the target app token for input method window"
* commit 'fda1bff8a8eda96662577820102aaaa02a0845b6':
  Correct the target app token for input method window
2013-03-18 10:38:24 -07:00
Craig Mautner
fda1bff8a8 Merge "Correct the target app token for input method window" 2013-03-18 15:56:48 +00:00