Scott Main
7ba7c19f08
am f3b617fd: am bc522717: am 93a4ab2f: am 8f70a7c4: move the nsdchat sample to proper download directory
...
* commit 'f3b617fdef50d21a4dd829c8be623455abfa7fb3':
move the nsdchat sample to proper download directory
2013-01-04 19:04:44 -08:00
Scott Main
f3b617fdef
am bc522717: am 93a4ab2f: am 8f70a7c4: move the nsdchat sample to proper download directory
...
* commit 'bc522717a7bbb0284d6bc37858ddda499b5c0696':
move the nsdchat sample to proper download directory
2013-01-04 19:02:09 -08:00
Scott Main
c3a2735c98
am 1a67e292: am 79393df9: am bf85e053: am 4bc407e3: am 47e8d20d: move network usage sample zip
...
* commit '1a67e29262acba85396e85cf2d9c5dfdb28241c8':
move network usage sample zip
2013-01-04 19:01:37 -08:00
Scott Main
bc522717a7
am 93a4ab2f: am 8f70a7c4: move the nsdchat sample to proper download directory
...
* commit '93a4ab2fa2efd8908c30298796af710c1ec0f85f':
move the nsdchat sample to proper download directory
2013-01-04 18:59:30 -08:00
Scott Main
1a67e29262
am 79393df9: am bf85e053: am 4bc407e3: am 47e8d20d: move network usage sample zip
...
* commit '79393df90b6e1cd85673d204cc5fd7f1ed542981':
move network usage sample zip
2013-01-04 18:58:55 -08:00
Scott Main
93a4ab2fa2
am 8f70a7c4: move the nsdchat sample to proper download directory
...
* commit '8f70a7c46cc3c4732b11fd8088b47c3434cf64d9':
move the nsdchat sample to proper download directory
2013-01-04 18:57:18 -08:00
Scott Main
79393df90b
am bf85e053: am 4bc407e3: am 47e8d20d: move network usage sample zip
...
* commit 'bf85e0537d0df27ab5229b8745c59a995f560df5':
move network usage sample zip
2013-01-04 18:56:40 -08:00
Scott Main
8f70a7c46c
move the nsdchat sample to proper download directory
...
Change-Id: I9679e5642ffaa1baad104c5fa1c1f90b59a5b1ff
2013-01-04 18:54:08 -08:00
Scott Main
bf85e0537d
am 4bc407e3: am 47e8d20d: move network usage sample zip
...
* commit '4bc407e3e1948bff1b57f552dba142d54191b264':
move network usage sample zip
2013-01-04 18:53:50 -08:00
Scott Main
4bc407e3e1
am 47e8d20d: move network usage sample zip
...
* commit '47e8d20d7b87be59ce38828659231afd425d05f8':
move network usage sample zip
2013-01-04 18:51:32 -08:00
Scott Main
47e8d20d7b
move network usage sample zip
...
Change-Id: I4ed2ebe357d420fea20d69515d9e91dc73579bba
2013-01-04 18:47:39 -08:00
Scott Main
5effcc5438
am a6d6fbfc: am ff941423: am 181bb3aa: am 921c8a5d: am 4e483ed3: Merge "docs: misc bug fixes. including important versioning fixes for first app class" into jb-mr1-dev
...
* commit 'a6d6fbfc8a5809e8164a5bf357540d8e6f5a87cf':
docs: misc bug fixes. including important versioning fixes for first app class
2013-01-04 18:29:16 -08:00
Scott Main
a6d6fbfc8a
am ff941423: am 181bb3aa: am 921c8a5d: am 4e483ed3: Merge "docs: misc bug fixes. including important versioning fixes for first app class" into jb-mr1-dev
...
* commit 'ff9414235a4d9052bd3003464be4649607447c9a':
docs: misc bug fixes. including important versioning fixes for first app class
2013-01-04 18:26:14 -08:00
Scott Main
ff9414235a
am 181bb3aa: am 921c8a5d: am 4e483ed3: Merge "docs: misc bug fixes. including important versioning fixes for first app class" into jb-mr1-dev
...
* commit '181bb3aabc81f7e834e62874065c640dbc900f3e':
docs: misc bug fixes. including important versioning fixes for first app class
2013-01-04 18:23:58 -08:00
Scott Main
181bb3aabc
am 921c8a5d: am 4e483ed3: Merge "docs: misc bug fixes. including important versioning fixes for first app class" into jb-mr1-dev
...
* commit '921c8a5d86b08d331b757534a36ac519694ab2a2':
docs: misc bug fixes. including important versioning fixes for first app class
2013-01-04 18:20:57 -08:00
Scott Main
921c8a5d86
am 4e483ed3: Merge "docs: misc bug fixes. including important versioning fixes for first app class" into jb-mr1-dev
...
* commit '4e483ed30697472aceb05bb1555f14b066ee8502':
docs: misc bug fixes. including important versioning fixes for first app class
2013-01-04 18:19:00 -08:00
Scott Main
4e483ed306
Merge "docs: misc bug fixes. including important versioning fixes for first app class" into jb-mr1-dev
2013-01-04 18:16:16 -08:00
Scott Main
f8daf19971
docs: misc bug fixes. including important versioning fixes for first app class
...
Change-Id: Ifda2509fc90dd795bfd6c5e9b3d7eebcbd77892a
2013-01-04 18:09:29 -08:00
Katie McCormick
1582b1d296
am 00ac55ed: am dcab3ee6: am 78971634: am 928d2634: am 2b13a475: Doc update: fixed manifest typo in Network zip
...
* commit '00ac55ed8b56721536eedf509ea754f4f3737d98':
Doc update: fixed manifest typo in Network zip
2013-01-04 17:51:08 -08:00
Brian Carlstrom
305efe23a3
am 498eaf58: am bc7d5a55: am 537fb0af: Merge "Use most specific attributes for distinguished name display"
...
* commit '498eaf58ad399e42cf7b3aca020b828c35023288':
Use most specific attributes for distinguished name display
2013-01-04 17:50:52 -08:00
Katie McCormick
00ac55ed8b
am dcab3ee6: am 78971634: am 928d2634: am 2b13a475: Doc update: fixed manifest typo in Network zip
...
* commit 'dcab3ee6581fef5a2ed0e1e15a5d86d54ddbec6e':
Doc update: fixed manifest typo in Network zip
2013-01-04 16:42:06 -08:00
Katie McCormick
dcab3ee658
am 78971634: am 928d2634: am 2b13a475: Doc update: fixed manifest typo in Network zip
...
* commit '789716346ac21248efa37d3a7eadad854bbff350':
Doc update: fixed manifest typo in Network zip
2013-01-04 16:39:35 -08:00
Katie McCormick
789716346a
am 928d2634: am 2b13a475: Doc update: fixed manifest typo in Network zip
...
* commit '928d2634ff9084ffc9d041b06fd7945cd8463801':
Doc update: fixed manifest typo in Network zip
2013-01-04 16:36:48 -08:00
Katie McCormick
928d2634ff
am 2b13a475: Doc update: fixed manifest typo in Network zip
...
* commit '2b13a475409aa28890c93088e86c065da1b07044':
Doc update: fixed manifest typo in Network zip
2013-01-04 16:34:19 -08:00
Katie McCormick
2b13a47540
Doc update: fixed manifest typo in Network zip
...
Change-Id: Iccf6dbce9d975337ab23b26dce63d3ec31303320
2013-01-04 16:17:45 -08:00
Brian Carlstrom
498eaf58ad
am bc7d5a55: am 537fb0af: Merge "Use most specific attributes for distinguished name display"
...
* commit 'bc7d5a55b22ce30af250cc7468b6c5987cd25dfd':
Use most specific attributes for distinguished name display
2013-01-04 15:51:09 -08:00
Tor Norbye
72c6137a7a
Handle empty flag attributes, such as gravity=""
...
Without this, an empty string will be passed into
XmlUtils.convertValueToInt, which throws an
index out of range exception.
Change-Id: Ibd1a140e207653b205852087f33ccb87fbbb9bbc
2013-01-04 15:48:58 -08:00
Brian Carlstrom
bc7d5a55b2
am 537fb0af: Merge "Use most specific attributes for distinguished name display"
...
* commit '537fb0afe24a520e7b9a2442786b6fb4fe194392':
Use most specific attributes for distinguished name display
2013-01-04 15:47:39 -08:00
Brian Carlstrom
537fb0afe2
Merge "Use most specific attributes for distinguished name display"
2013-01-04 15:40:35 -08:00
Brian Carlstrom
91154ce658
Use most specific attributes for distinguished name display
...
Bug: 7894348
Bug: http://code.google.com/p/android/issues/detail?id=41662
Change-Id: I8048a53b8a9a17b384f12b6a4f40071bb3dd3e04
2013-01-04 15:27:24 -08:00
Romain Guy
48f7cfb106
Merge "Properly support ALPHA_8 bitmaps in all drawBitmap() methods"
2013-01-04 15:21:36 -08:00
Romain Guy
886b275e52
Properly support ALPHA_8 bitmaps in all drawBitmap() methods
...
Change-Id: I869993c59e0a0d76f369c09acbae711753908f48
2013-01-04 15:15:16 -08:00
Selim Gurun
5c11ef10db
Remove doc references to private browsing.
...
Remove reference to private browsing since it is no longer supported.
Change-Id: I65bc8aecd949717f662454d4bd1759ca91ad553d
2013-01-04 14:58:36 -08:00
Scott Main
dd18adb28e
am 4a95952b: am 105a581b: am 75420403: am 7edf8074: am 197d0a66: Merge "docs: update sony driver link and name bug: 6566732" into jb-mr1-dev
...
* commit '4a95952bc3ac6cef9ea2d00072de1fc5440a9a62':
docs: update sony driver link and name bug: 6566732
2013-01-04 11:44:09 -08:00
Scott Main
4a95952bc3
am 105a581b: am 75420403: am 7edf8074: am 197d0a66: Merge "docs: update sony driver link and name bug: 6566732" into jb-mr1-dev
...
* commit '105a581b4fad270cae3120c58903ba0241db1e6d':
docs: update sony driver link and name bug: 6566732
2013-01-04 11:40:38 -08:00
Scott Main
105a581b4f
am 75420403: am 7edf8074: am 197d0a66: Merge "docs: update sony driver link and name bug: 6566732" into jb-mr1-dev
...
* commit '754204037234c2dbef8306df0066cb4edbf2a41c':
docs: update sony driver link and name bug: 6566732
2013-01-04 11:38:52 -08:00
Scott Main
7542040372
am 7edf8074: am 197d0a66: Merge "docs: update sony driver link and name bug: 6566732" into jb-mr1-dev
...
* commit '7edf80747171d61bf8f22e00a8318b2da5ae9400':
docs: update sony driver link and name bug: 6566732
2013-01-04 11:36:41 -08:00
Scott Main
7edf807471
am 197d0a66: Merge "docs: update sony driver link and name bug: 6566732" into jb-mr1-dev
...
* commit '197d0a6688ccf72632b461987671f1f2802935b7':
docs: update sony driver link and name bug: 6566732
2013-01-04 11:33:59 -08:00
Scott Main
197d0a6688
Merge "docs: update sony driver link and name bug: 6566732" into jb-mr1-dev
2013-01-04 11:29:32 -08:00
Scott Main
9c6cec7b89
docs: update sony driver link and name
...
bug: 6566732
Change-Id: I8cb6e3295a24a7876d9cc9493889d85688357f79
2013-01-04 11:24:10 -08:00
Robert Ly
64e7e22c5f
am 1b1766f1: am 7ae93164: am 29618824: am e478fb4f: am 6b79e954: Merge "docs: update gms and gcm javadocs with new TOC" into jb-mr1-dev
...
* commit '1b1766f1003895eff65ab73148221fa2b5f0db1f':
docs: update gms and gcm javadocs with new TOC
2013-01-04 11:17:56 -08:00
Robert Ly
1b1766f100
am 7ae93164: am 29618824: am e478fb4f: am 6b79e954: Merge "docs: update gms and gcm javadocs with new TOC" into jb-mr1-dev
...
* commit '7ae9316428087846d588d3a8f70fa649ebf5e090':
docs: update gms and gcm javadocs with new TOC
2013-01-04 11:11:29 -08:00
Robert Ly
7ae9316428
am 29618824: am e478fb4f: am 6b79e954: Merge "docs: update gms and gcm javadocs with new TOC" into jb-mr1-dev
...
* commit '296188242d15c34229aaa2c5d87960dca7d1285a':
docs: update gms and gcm javadocs with new TOC
2013-01-04 11:09:07 -08:00
Robert Ly
296188242d
am e478fb4f: am 6b79e954: Merge "docs: update gms and gcm javadocs with new TOC" into jb-mr1-dev
...
* commit 'e478fb4fa74771863f8c98c04e93a1bd4f2f46ae':
docs: update gms and gcm javadocs with new TOC
2013-01-04 11:06:15 -08:00
Robert Ly
e478fb4fa7
am 6b79e954: Merge "docs: update gms and gcm javadocs with new TOC" into jb-mr1-dev
...
* commit '6b79e9542b2b2fae18a882696e61adb4fce144eb':
docs: update gms and gcm javadocs with new TOC
2013-01-04 11:03:04 -08:00
Robert Ly
6b79e9542b
Merge "docs: update gms and gcm javadocs with new TOC" into jb-mr1-dev
2013-01-04 10:58:55 -08:00
Robert Ly
d84d5ccdd4
docs: update gms and gcm javadocs with new TOC
...
Change-Id: Ic54c4e4e6e2b0008450abe9d3aa1ae53535d9160
2013-01-04 10:41:41 -08:00
suyi Yuan
be7af83829
Correcting typo in doc of MEDIA_XXX intents
...
Correcting typo in documents of MEDIA_MOUNTED,
MEDIA_UNMOUNTED,MEDIA_UNMOUNTABLE intents, which
may be confusing to APP developers.
Change-Id: Id909b7bfad98e305b8054978f054f4fb9b705311
2013-01-04 21:21:59 +08:00
Elliott Hughes
0aa212e32a
am a74d1332: am 81cfb63e: am d13b23a4: Merge "Revert "fix potential memory leak""
...
* commit 'a74d1332cc9f63dc3187cfa74befb448dab5e77d':
Revert "fix potential memory leak"
2013-01-03 18:53:06 -08:00
Elliott Hughes
6bbc79f26e
am f18eb323: am 767e1c01: am 9aac0c1b: Merge "fix potential memory leak"
...
* commit 'f18eb323c38cd4407b16dc8eda1cc860bb100850':
fix potential memory leak
2013-01-03 18:53:02 -08:00