Jeff Sharkey
bfea4f04f2
am f5377a72: Merge "Useful annotations for code documentation." into jb-mr1.1-dev
...
* commit 'f5377a7242d71e221807150f0778a0521e1270b6':
Useful annotations for code documentation.
2012-11-15 11:53:19 -08:00
Jeff Sharkey
68363456c1
am 7420ab68: Merge "Utility to format human-friendly durations." into jb-mr1.1-dev
...
* commit '7420ab681eaad22f4b8f884e12d3b2ce82cd203a':
Utility to format human-friendly durations.
2012-11-15 11:51:38 -08:00
Jeff Sharkey
64f369a542
am a319d655: Merge "Avoid runtime restart after vold reconnects." into jb-mr1.1-dev
...
* commit 'a319d655e336ffb0fcbee65b77926a32660c7f3f':
Avoid runtime restart after vold reconnects.
2012-11-15 11:51:33 -08:00
Jeff Sharkey
f5377a7242
Merge "Useful annotations for code documentation." into jb-mr1.1-dev
2012-11-15 11:48:38 -08:00
Jeff Sharkey
dcb72dbb39
am 445767c1: Merge "Watch for leaked ParcelFileDescriptors." into jb-mr1.1-dev
...
* commit '445767c14ceb51d2839a7bc818c68c81ee7d80a7':
Watch for leaked ParcelFileDescriptors.
2012-11-15 11:47:43 -08:00
Jeff Sharkey
fa0fb7c508
am f6ba84b4: Merge "Reduce verbosity of service event logging." into jb-mr1.1-dev
...
* commit 'f6ba84b4242419f4765e0efcb5df82e37ad03faa':
Reduce verbosity of service event logging.
2012-11-15 11:47:40 -08:00
Jeff Sharkey
7420ab681e
Merge "Utility to format human-friendly durations." into jb-mr1.1-dev
2012-11-15 11:47:36 -08:00
Jeff Sharkey
a319d655e3
Merge "Avoid runtime restart after vold reconnects." into jb-mr1.1-dev
2012-11-15 11:46:19 -08:00
Jeff Sharkey
445767c14c
Merge "Watch for leaked ParcelFileDescriptors." into jb-mr1.1-dev
2012-11-15 11:45:23 -08:00
Jeff Sharkey
f6ba84b424
Merge "Reduce verbosity of service event logging." into jb-mr1.1-dev
2012-11-15 11:44:13 -08:00
Scott Main
8361b846d1
am 1f4c9d3e: am 7425bf86: Merge "docs: fix ndk tos layout for small screens" into jb-mr1-dev
...
* commit '1f4c9d3e90d13ef166d28a689221df6ffe21c238':
docs: fix ndk tos layout for small screens
2012-11-15 11:10:46 -08:00
Scott Main
1f4c9d3e90
am 7425bf86: Merge "docs: fix ndk tos layout for small screens" into jb-mr1-dev
...
* commit '7425bf864e0dcefe238daa4c4bf7745095f262d2':
docs: fix ndk tos layout for small screens
2012-11-15 11:08:28 -08:00
Scott Main
7425bf864e
Merge "docs: fix ndk tos layout for small screens" into jb-mr1-dev
2012-11-15 11:04:38 -08:00
Scott Main
9886540d88
docs: fix ndk tos layout for small screens
...
Change-Id: I95e11481cdfe759416b4a661580ee9e6b0dd24d2
2012-11-15 11:03:46 -08:00
Scott Main
db86f5d282
am 988571a8: am bce26803: docs: fix broken youtube playlists
...
* commit '988571a811ed6da6a379402813febc118f3f4e78':
docs: fix broken youtube playlists
2012-11-15 10:35:53 -08:00
Scott Main
988571a811
am bce26803: docs: fix broken youtube playlists
...
* commit 'bce268034e4e881704c4263822315bc9a4f9aa43':
docs: fix broken youtube playlists
2012-11-15 10:32:39 -08:00
Scott Main
bce268034e
docs: fix broken youtube playlists
...
Change-Id: I07a1e9af2c8104a56c9a5e6d1060de7578cbd1ae
2012-11-15 10:26:40 -08:00
kmccormick@google.com
afbf515be3
am 47972cea: am 480ac7fc: am 596d0e38: am f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs
...
* commit '47972cea307f64334eff79bd6184992364f43179':
Doc Update: Fixing images
2012-11-15 09:56:38 -08:00
kmccormick@google.com
47972cea30
am 480ac7fc: am 596d0e38: am f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs
...
* commit '480ac7fca61a29a7a1ca150ea0a583901971f137':
Doc Update: Fixing images
2012-11-15 09:54:41 -08:00
kmccormick@google.com
480ac7fca6
am 596d0e38: am f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs
...
* commit '596d0e3881782096f7a6ea9959e8dc5f07004623':
Doc Update: Fixing images
2012-11-15 09:51:56 -08:00
kmccormick@google.com
596d0e3881
am f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs
...
* commit 'f53c5f3683b71d232a78e04ea06649dd5e4bfee1':
Doc Update: Fixing images
2012-11-15 09:49:21 -08:00
kmccormick@google.com
f53c5f3683
am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs
...
* commit 'd1ae2721fa7b350b979e75319812636ea31bb56b':
Doc Update: Fixing images
2012-11-15 09:45:46 -08:00
&& repo sync -j8
d1ae2721fa
Merge "Doc Update: Fixing images" into jb-dev-docs
2012-11-15 09:43:18 -08:00
Baligh Uddin
a3a2c6a9c9
am ecc2bcb5: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
...
* commit 'ecc2bcb5122179d5db79306e8d4f90db0b52c0d5':
Import translations. DO NOT MERGE
2012-11-15 08:20:17 -08:00
Baligh Uddin
2028f8e098
am 38939259: am c3b6ee60: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '389392590178fde1195c2c43f8c540eef5202779':
Import translations. DO NOT MERGE
2012-11-15 08:18:40 -08:00
Baligh Uddin
ecc2bcb512
Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
2012-11-15 08:17:16 -08:00
Baligh Uddin
3893925901
am c3b6ee60: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'c3b6ee6068f7970c2a7f9da6f784adc2e6b2bceb':
Import translations. DO NOT MERGE
2012-11-15 08:16:31 -08:00
Baligh Uddin
c3b6ee6068
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-11-15 08:13:48 -08:00
Baligh Uddin
5a1b49b19b
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-11-15 08:12:49 -08:00
Baligh Uddin
59ae7069c6
am 8264bd80: am 36c7d313: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '8264bd80f2f3bcf684176b6945968f978b337680':
Import translations. DO NOT MERGE
2012-11-15 08:09:17 -08:00
Baligh Uddin
8264bd80f2
am 36c7d313: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '36c7d313af815c8842d7ca9002ff36bfe347716b':
Import translations. DO NOT MERGE
2012-11-15 08:06:37 -08:00
Baligh Uddin
defe761515
am aaf3fbc6: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
...
* commit 'aaf3fbc665bf2252713afee7ef22536b590a71a2':
Import translations. DO NOT MERGE
2012-11-15 08:06:36 -08:00
Baligh Uddin
aaf3fbc665
Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
2012-11-15 08:03:08 -08:00
Baligh Uddin
36c7d313af
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-11-15 08:02:17 -08:00
Baligh Uddin
f118bcc5b2
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-11-15 07:59:36 -08:00
Daniel Sandler
00679b5b46
am 020d6529: Merge "Do not vibe when the default notification sound is Silent." into jb-mr1.1-dev
...
* commit '020d65290a6fe7dc5465d36c259ec62dcfd71c1f':
Do not vibe when the default notification sound is Silent.
2012-11-15 06:13:50 -08:00
Daniel Sandler
2bb5dc6a36
am 83b25961: Merge "Notification vibration improvements:" into jb-mr1.1-dev
...
* commit '83b2596155ec1845194c08bd27a6e8dfbeb530b9':
Notification vibration improvements:
2012-11-15 06:13:46 -08:00
Daniel Sandler
020d65290a
Merge "Do not vibe when the default notification sound is Silent." into jb-mr1.1-dev
2012-11-15 05:05:44 -08:00
Daniel Sandler
83b2596155
Merge "Notification vibration improvements:" into jb-mr1.1-dev
2012-11-15 05:03:11 -08:00
Scott Main
2da041f09d
am 0622ed7f: am 0034beab: resolved conflicts for merge of 783e115b to jb-mr1-dev
...
* commit '0622ed7fbb64e1cd156c453d9412b544c4e84fb1':
implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the list of classes/lessons on each course landing page.
2012-11-14 19:15:37 -08:00
Scott Main
0622ed7fbb
am 0034beab: resolved conflicts for merge of 783e115b to jb-mr1-dev
...
* commit '0034beab72d6574de5009e5947729a2bfd17d66e':
implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the list of classes/lessons on each course landing page.
2012-11-14 19:13:05 -08:00
Scott Main
0034beab72
resolved conflicts for merge of 783e115b to jb-mr1-dev
...
Change-Id: Ibfd3023a845fb6cc549f05bcff2d6e4abc7e5a07
2012-11-14 19:10:18 -08:00
Scott Main
783e115b60
resolved conflicts for merge of e907a390 to jb-dev-plus-aosp
...
Change-Id: I4e216b81f33b4b7c238f74f1c475bc84df3f79ef
2012-11-14 19:04:05 -08:00
&& repo sync -j8
1019a9c44e
Doc Update: Fixing images
...
Bug: 7542170
Change-Id: I18e5d360e21af9d30864456ae429b804314e1edb
2012-11-14 18:27:36 -08:00
Scott Main
e907a3909d
am 22cc2764: implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the lis
...
* commit '22cc2764cc74e52888b043e0c6371594305bb5e9':
implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the list of classes/lessons on each course landing page.
2012-11-14 17:38:15 -08:00
Scott Main
22cc2764cc
implement new organization for Training classes
...
This also moves a few of the documents from API Guides > Best Practices
into the new courses for best practices.
This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d
which generates the list of classes/lessons on each course landing page.
Change-Id: I8132f72f78d844c3b035c7aa269ad3b88a25d02a
2012-11-14 17:30:24 -08:00
Joe Fernandez
6b0405038e
am 335cbfa8: am e3be79be: Merge "docs: Added note on MIPS system image additions" into jb-mr1-dev
...
* commit '335cbfa89a8b604562bc2bc325b20236cd178fec':
docs: Added note on MIPS system image additions
2012-11-14 17:03:11 -08:00
Joe Fernandez
335cbfa89a
am e3be79be: Merge "docs: Added note on MIPS system image additions" into jb-mr1-dev
...
* commit 'e3be79be3f81f1af67f4f6704ae452512065bce6':
docs: Added note on MIPS system image additions
2012-11-14 17:00:55 -08:00
Joe Fernandez
e3be79be3f
Merge "docs: Added note on MIPS system image additions" into jb-mr1-dev
2012-11-14 16:57:30 -08:00
Scott Main
d654f19d17
am ca22aee8: am 8680f8ff: Merge "docs: add warning for adt bundle on 32-bit os" into jb-mr1-dev
...
* commit 'ca22aee8637ab69550cd8f5475efae0fcbf70d0b':
docs: add warning for adt bundle on 32-bit os
2012-11-14 15:15:28 -08:00
