94354 Commits

Author SHA1 Message Date
Jason Noguchi
8d73c043c8 am be6ff0b8: am 66480258: am ba5fd35e: am 7b4e597f: Merge "Adding camera scene mode stress test." into jb-mr1-dev
* commit 'be6ff0b83659dffa0c7c290c520474eda70bee07':
  Adding camera scene mode stress test.
2013-01-07 18:48:46 -08:00
Jason Noguchi
be6ff0b836 am 66480258: am ba5fd35e: am 7b4e597f: Merge "Adding camera scene mode stress test." into jb-mr1-dev
* commit '664802589d4c8953f8b9213135b482719345d7d7':
  Adding camera scene mode stress test.
2013-01-07 18:47:01 -08:00
Jason Noguchi
664802589d am ba5fd35e: am 7b4e597f: Merge "Adding camera scene mode stress test." into jb-mr1-dev
* commit 'ba5fd35e24778c29ad0786d865c2cbdf3a5ab27d':
  Adding camera scene mode stress test.
2013-01-07 18:45:30 -08:00
Jason Noguchi
ba5fd35e24 am 7b4e597f: Merge "Adding camera scene mode stress test." into jb-mr1-dev
* commit '7b4e597faff3c469bdd5e7837155a5fc5ea036bc':
  Adding camera scene mode stress test.
2013-01-07 18:43:18 -08:00
Jason Noguchi
7b4e597faf Merge "Adding camera scene mode stress test." into jb-mr1-dev 2013-01-07 18:40:28 -08:00
Dake Gu
05d485044b am af6dd103: Merge "fix ImageView.getImageMatrix()" into jb-mr1-aah-dev
* commit 'af6dd103bd2bb0783b9364c703c2623260496d5c':
  fix ImageView.getImageMatrix()
2013-01-07 18:13:30 -08:00
Dake Gu
af6dd103bd Merge "fix ImageView.getImageMatrix()" into jb-mr1-aah-dev 2013-01-07 18:10:21 -08:00
Scott Main
aa516b10dd am 76c28e54: am 7fc128fe: am b2039756: am e30d31c4: docs: misc bugs from external tracker
* commit '76c28e54b876207d468309aecb2ff2f4708a6ca4':
  docs: misc bugs from external tracker
2013-01-07 16:06:40 -08:00
Scott Main
76c28e54b8 am 7fc128fe: am b2039756: am e30d31c4: docs: misc bugs from external tracker
* commit '7fc128fef94273b82c66bd636ff7f9fced9a68db':
  docs: misc bugs from external tracker
2013-01-07 16:04:04 -08:00
Scott Main
7fc128fef9 am b2039756: am e30d31c4: docs: misc bugs from external tracker
* commit 'b203975610a8ebac9345aa381b008466389dfa33':
  docs: misc bugs from external tracker
2013-01-07 16:01:17 -08:00
Dianne Hackborn
609d79a0dd am c02bbfb3: am 9fae2ecc: Merge "Handle nested folder case"
* commit 'c02bbfb3ea64ec9f4f3e6eff796b0bfe571bda9b':
  Handle nested folder case
2013-01-07 15:58:43 -08:00
Scott Main
b203975610 am e30d31c4: docs: misc bugs from external tracker
* commit 'e30d31c4e8439f8fa8647744cee93f1fd8b67407':
  docs: misc bugs from external tracker
2013-01-07 15:58:19 -08:00
Dianne Hackborn
c02bbfb3ea am 9fae2ecc: Merge "Handle nested folder case"
* commit '9fae2ecc5fb777230bde74e4a099fb4e98bf34b4':
  Handle nested folder case
2013-01-07 15:56:20 -08:00
Scott Main
e30d31c4e8 docs: misc bugs from external tracker
Change-Id: I928659b23d1ff3a5d017d4fb50acb8ac0e3b251b
2013-01-07 15:54:30 -08:00
Dianne Hackborn
9fae2ecc5f Merge "Handle nested folder case" 2013-01-07 15:20:45 -08:00
Dianne Hackborn
53d998368c am 26c00dec: am b2d3904b: Merge "Setting the default value for dock audio"
* commit '26c00decb4c0352913396851c2b42a8705976614':
  Setting the default value for dock audio
2013-01-07 13:53:12 -08:00
Dianne Hackborn
26c00decb4 am b2d3904b: Merge "Setting the default value for dock audio"
* commit 'b2d3904b0d0f02b3eddef1d228724b99962cba56':
  Setting the default value for dock audio
2013-01-07 13:26:38 -08:00
Dianne Hackborn
449f006f93 am 2a8de804: am 350d5168: Merge "Correcting typo in doc of MEDIA_XXX intents"
* commit '2a8de804a2a8313fc4571a73c625d8213237b825':
  Correcting typo in doc of MEDIA_XXX intents
2013-01-07 12:20:16 -08:00
Dianne Hackborn
9b59509c6a am 138a3d3f: am d5d6f04f: Merge "Hopefully fix PendingIntent.getActivities() documentation wtf."
* commit '138a3d3f1a7990606c5aa0cb92019dac8568f3ec':
  Hopefully fix PendingIntent.getActivities() documentation wtf.
2013-01-07 12:19:58 -08:00
Dianne Hackborn
b2d3904b0d Merge "Setting the default value for dock audio" 2013-01-07 12:17:25 -08:00
Dianne Hackborn
2a8de804a2 am 350d5168: Merge "Correcting typo in doc of MEDIA_XXX intents"
* commit '350d5168e495c642873ee511d4e8dc27ac5377ce':
  Correcting typo in doc of MEDIA_XXX intents
2013-01-07 12:16:40 -08:00
Dianne Hackborn
138a3d3f1a am d5d6f04f: Merge "Hopefully fix PendingIntent.getActivities() documentation wtf."
* commit 'd5d6f04f2ab0db0aea03e3ab1cdd378fcc952bad':
  Hopefully fix PendingIntent.getActivities() documentation wtf.
2013-01-07 12:16:23 -08:00
Dianne Hackborn
350d5168e4 Merge "Correcting typo in doc of MEDIA_XXX intents" 2013-01-07 11:21:54 -08:00
Dianne Hackborn
d5d6f04f2a Merge "Hopefully fix PendingIntent.getActivities() documentation wtf." 2013-01-07 11:19:11 -08:00
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
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
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