94314 Commits

Author SHA1 Message Date
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
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
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
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
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
Elliott Hughes
a74d1332cc am 81cfb63e: am d13b23a4: Merge "Revert "fix potential memory leak""
* commit '81cfb63e9fc6ef72e5b488225fe9b7a43551fc9e':
  Revert "fix potential memory leak"
2013-01-03 18:50:08 -08:00
Elliott Hughes
f18eb323c3 am 767e1c01: am 9aac0c1b: Merge "fix potential memory leak"
* commit '767e1c010c0664fa4bf7e7e32b840af4bbe0b0cf':
  fix potential memory leak
2013-01-03 18:50:03 -08:00
Elliott Hughes
81cfb63e9f am d13b23a4: Merge "Revert "fix potential memory leak""
* commit 'd13b23a436075262cc83f7502f7159de24546003':
  Revert "fix potential memory leak"
2013-01-03 18:47:37 -08:00
Elliott Hughes
767e1c010c am 9aac0c1b: Merge "fix potential memory leak"
* commit '9aac0c1b35ec666a18f320be99e6aa37d0bcf202':
  fix potential memory leak
2013-01-03 18:47:32 -08:00
Scott Main
c41db6c9ba am 834b0f3c: am 19b17b41: am 38a642e9: am 3e2479dd: Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev
* commit '834b0f3cd90679655ac1549cb427fc9475ac4a4b':
  docs: fix broken links and add new sitemap text file
2013-01-03 18:44:22 -08:00
Scott Main
834b0f3cd9 am 19b17b41: am 38a642e9: am 3e2479dd: Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev
* commit '19b17b419cb11c2ff064021ebdd0dda1daab4c35':
  docs: fix broken links and add new sitemap text file
2013-01-03 18:42:05 -08:00
Scott Main
19b17b419c am 38a642e9: am 3e2479dd: Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev
* commit '38a642e987612da86dc4f30b8d2c66a4a4833682':
  docs: fix broken links and add new sitemap text file
2013-01-03 18:38:56 -08:00
Scott Main
38a642e987 am 3e2479dd: Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev
* commit '3e2479dd20ee9a1dab17e5dbec7fc835f2fa427f':
  docs: fix broken links and add new sitemap text file
2013-01-03 18:36:45 -08:00
Scott Main
3e2479dd20 Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev 2013-01-03 18:32:45 -08:00
Scott Main
188315cf8b docs: fix broken links and add new sitemap text file
Change-Id: If0f7967a65a6e3a444a565a2e8229a04a5265f56
2013-01-03 18:02:21 -08:00
Elliott Hughes
d13b23a436 Merge "Revert "fix potential memory leak"" 2013-01-03 17:40:55 -08:00
Adam Powell
262b311c3c am b7de79d0: am 41bb82be: Merge "Fix NullpointException problem in onMenuItemSelected"
* commit 'b7de79d02743cc3b5372be27be818d3227a34e2b':
  Fix NullpointException problem in onMenuItemSelected
2013-01-03 17:40:32 -08:00
Elliott Hughes
957efcdc73 Revert "fix potential memory leak"
This reverts commit bc268b9014f211910e412a7fda96b6394ff2badc

Change-Id: I07f49bd0cfecc43bc761d2b0635c9915a8e30272
2013-01-03 17:38:57 -08:00
Adam Powell
b7de79d027 am 41bb82be: Merge "Fix NullpointException problem in onMenuItemSelected"
* commit '41bb82becea5dd1f995dbca5bf5a719f559102de':
  Fix NullpointException problem in onMenuItemSelected
2013-01-03 17:37:49 -08:00
Elliott Hughes
9aac0c1b35 Merge "fix potential memory leak" 2013-01-03 17:35:57 -08:00
Sungmin Choi
bc268b9014 fix potential memory leak
use delete before return

Change-Id: I5449ad90bb6910f057bd825b722c9803a7343c34
2013-01-04 09:56:18 +09:00
Adam Powell
41bb82bece Merge "Fix NullpointException problem in onMenuItemSelected" 2013-01-03 16:46:03 -08:00
Katie McCormick
0f7cc697ed am f420b800: am 47f56dbf: am d56e4eca: am ed2a05bc: Merge "Doc change: minor fixes to support lib lesson." into jb-mr1-dev
* commit 'f420b800b8813aee636f955012da6fb87e631827':
  Doc change: minor fixes to support lib lesson.
2013-01-03 16:20:07 -08:00
Katie McCormick
f420b800b8 am 47f56dbf: am d56e4eca: am ed2a05bc: Merge "Doc change: minor fixes to support lib lesson." into jb-mr1-dev
* commit '47f56dbf692939ba30a347844d6688e120a666ea':
  Doc change: minor fixes to support lib lesson.
2013-01-03 16:16:47 -08:00
Katie McCormick
47f56dbf69 am d56e4eca: am ed2a05bc: Merge "Doc change: minor fixes to support lib lesson." into jb-mr1-dev
* commit 'd56e4eca33639f175790d136d76f0d9cab9b95c3':
  Doc change: minor fixes to support lib lesson.
2013-01-03 16:14:39 -08:00
Katie McCormick
d56e4eca33 am ed2a05bc: Merge "Doc change: minor fixes to support lib lesson." into jb-mr1-dev
* commit 'ed2a05bc5b05e8aec0777ce2eb57bb91626524d8':
  Doc change: minor fixes to support lib lesson.
2013-01-03 16:11:31 -08:00
Katie McCormick
ed2a05bc5b Merge "Doc change: minor fixes to support lib lesson." into jb-mr1-dev 2013-01-03 16:07:45 -08:00
Katie McCormick
e06b0838e3 Doc change: minor fixes to support lib lesson.
Bug # 7633596

Change-Id: I380300b818cb6886c3c6857b64ba54e0602f7a37
2013-01-03 16:01:33 -08:00