OSDN Git Service

android-x86/frameworks-base.git
11 years agoam d1779207: am 0bf63a9a: am d29f2d26: Merge "Make action bar title a valid touch...
Adam Powell [Wed, 9 Jan 2013 19:28:27 +0000 (11:28 -0800)]
am d1779207: am 0bf63a9a: am d29f2d26: Merge "Make action bar title a valid touch target for up when relevant" into jb-mr1.1-dev

* commit 'd17792073fd3ab963bd5e0a7edcb312720fcea26':
  Make action bar title a valid touch target for up when relevant

11 years agoam 0bf63a9a: am d29f2d26: Merge "Make action bar title a valid touch target for up...
Adam Powell [Wed, 9 Jan 2013 19:26:07 +0000 (11:26 -0800)]
am 0bf63a9a: am d29f2d26: Merge "Make action bar title a valid touch target for up when relevant" into jb-mr1.1-dev

* commit '0bf63a9a76ba513b5f6c603857bcd4d3e4506566':
  Make action bar title a valid touch target for up when relevant

11 years agoam d29f2d26: Merge "Make action bar title a valid touch target for up when relevant...
Adam Powell [Wed, 9 Jan 2013 19:23:37 +0000 (11:23 -0800)]
am d29f2d26: Merge "Make action bar title a valid touch target for up when relevant" into jb-mr1.1-dev

* commit 'd29f2d263af9a3017799d3098ed208a49c5ecc69':
  Make action bar title a valid touch target for up when relevant

11 years agoMerge "Make action bar title a valid touch target for up when relevant" into jb-mr1...
Adam Powell [Wed, 9 Jan 2013 19:19:22 +0000 (11:19 -0800)]
Merge "Make action bar title a valid touch target for up when relevant" into jb-mr1.1-dev

11 years agoam 782b0f71: am 4459827f: am 25505f95: am cdf5106a: docs: a few doc bugs
Scott Main [Wed, 9 Jan 2013 04:21:17 +0000 (20:21 -0800)]
am 782b0f71: am 4459827f: am 25505f95: am cdf5106a: docs: a few doc bugs

* commit '782b0f7141972e0535f1e905d650073f4e7f55dd':
  docs: a few doc bugs

11 years agoam 4459827f: am 25505f95: am cdf5106a: docs: a few doc bugs
Scott Main [Wed, 9 Jan 2013 04:18:35 +0000 (20:18 -0800)]
am 4459827f: am 25505f95: am cdf5106a: docs: a few doc bugs

* commit '4459827f7db379031e658b2153aac1f7c882adc6':
  docs: a few doc bugs

11 years agoam 25505f95: am cdf5106a: docs: a few doc bugs
Scott Main [Wed, 9 Jan 2013 04:16:21 +0000 (20:16 -0800)]
am 25505f95: am cdf5106a: docs: a few doc bugs

* commit '25505f959cc5faada8f9d2af7784f898439fc264':
  docs: a few doc bugs

11 years agoam cdf5106a: docs: a few doc bugs
Scott Main [Wed, 9 Jan 2013 04:13:40 +0000 (20:13 -0800)]
am cdf5106a: docs: a few doc bugs

* commit 'cdf5106aafb77d17584d5401b207cbcc7a20f5f3':
  docs: a few doc bugs

11 years agodocs: a few doc bugs
Scott Main [Wed, 9 Jan 2013 04:03:05 +0000 (20:03 -0800)]
docs: a few doc bugs

Change-Id: I20d2ff2f3abfe674ca20f713c7213ee031c9bb1d

11 years agoMake action bar title a valid touch target for up when relevant
Adam Powell [Wed, 9 Jan 2013 03:26:21 +0000 (19:26 -0800)]
Make action bar title a valid touch target for up when relevant

arubin bug 7966136

Change-Id: Iea5b85852cc1664f1390a6f8b6179d63b50857e4

11 years agoam 2b8603c2: am 8429f43b: am 7bcea4ae: am d149242a: docs: correct the url path to...
Scott Main [Tue, 8 Jan 2013 22:40:50 +0000 (14:40 -0800)]
am 2b8603c2: am 8429f43b: am 7bcea4ae: am d149242a: docs: correct the url path to badge images and updated pr-br badge

* commit '2b8603c200843bc50768e2281fb1e2a953316e0c':
  docs: correct the url path to badge images and updated pr-br badge

11 years agoam 8429f43b: am 7bcea4ae: am d149242a: docs: correct the url path to badge images...
Scott Main [Tue, 8 Jan 2013 22:32:49 +0000 (14:32 -0800)]
am 8429f43b: am 7bcea4ae: am d149242a: docs: correct the url path to badge images and updated pr-br badge

* commit '8429f43b5f87c244511e3c76107f830ee16998a3':
  docs: correct the url path to badge images and updated pr-br badge

11 years agoam 7bcea4ae: am d149242a: docs: correct the url path to badge images and updated...
Scott Main [Tue, 8 Jan 2013 22:30:29 +0000 (14:30 -0800)]
am 7bcea4ae: am d149242a: docs: correct the url path to badge images and updated pr-br badge

* commit '7bcea4ae6b69907a2d12522416be168781645e0f':
  docs: correct the url path to badge images and updated pr-br badge

11 years agoam d149242a: docs: correct the url path to badge images and updated pr-br badge
Scott Main [Tue, 8 Jan 2013 22:27:34 +0000 (14:27 -0800)]
am d149242a: docs: correct the url path to badge images and updated pr-br badge

* commit 'd149242afc5aab745b5bbde0b67d6c333a5d685f':
  docs: correct the url path to badge images and updated pr-br badge

11 years agodocs: correct the url path to badge images
Scott Main [Tue, 8 Jan 2013 21:58:56 +0000 (13:58 -0800)]
docs: correct the url path to badge images
and updated pr-br badge

Change-Id: I23369b5f306f584714742dc4b58a47d7071805be

11 years agoam 5b56d432: am 9107fa5d: am 66adf0d0: am 70af3cdb: Merge "docs: resolve bugs from...
Scott Main [Tue, 8 Jan 2013 20:52:38 +0000 (12:52 -0800)]
am 5b56d432: am 9107fa5d: am 66adf0d0: am 70af3cdb: Merge "docs: resolve bugs from external tracker" into jb-mr1-dev

* commit '5b56d43237d959403bb8a32de25376deee2dab22':
  docs: resolve bugs from external tracker

11 years agoam 9107fa5d: am 66adf0d0: am 70af3cdb: Merge "docs: resolve bugs from external tracke...
Scott Main [Tue, 8 Jan 2013 20:45:36 +0000 (12:45 -0800)]
am 9107fa5d: am 66adf0d0: am 70af3cdb: Merge "docs: resolve bugs from external tracker" into jb-mr1-dev

* commit '9107fa5d7ca1b928e10ffc9395b2f2eb38db7a14':
  docs: resolve bugs from external tracker

11 years agoam 66adf0d0: am 70af3cdb: Merge "docs: resolve bugs from external tracker" into jb...
Scott Main [Tue, 8 Jan 2013 20:44:06 +0000 (12:44 -0800)]
am 66adf0d0: am 70af3cdb: Merge "docs: resolve bugs from external tracker" into jb-mr1-dev

* commit '66adf0d04d92257e60a583617fb97f136fefd192':
  docs: resolve bugs from external tracker

11 years agoam 4f8a160a: am f344e3c7: am 7ed49126: am 13ef4e43: docs: update GP badges with local...
Scott Main [Tue, 8 Jan 2013 20:43:43 +0000 (12:43 -0800)]
am 4f8a160a: am f344e3c7: am 7ed49126: am 13ef4e43: docs: update GP badges with localized badges. includes AI files for all badges in available languages

* commit '4f8a160ae36229d0661027f10c27fda900605cf6':
  docs: update GP badges with localized badges. includes AI files for all badges in available languages

11 years agoam 70af3cdb: Merge "docs: resolve bugs from external tracker" into jb-mr1-dev
Scott Main [Tue, 8 Jan 2013 20:42:10 +0000 (12:42 -0800)]
am 70af3cdb: Merge "docs: resolve bugs from external tracker" into jb-mr1-dev

* commit '70af3cdb90bafc081ffa693a350b95ced48b6cfd':
  docs: resolve bugs from external tracker

11 years agoam f344e3c7: am 7ed49126: am 13ef4e43: docs: update GP badges with localized badges...
Scott Main [Tue, 8 Jan 2013 20:40:09 +0000 (12:40 -0800)]
am f344e3c7: am 7ed49126: am 13ef4e43: docs: update GP badges with localized badges. includes AI files for all badges in available languages

* commit 'f344e3c7e7eaa8b2ec61435312e649fe35b56d7b':
  docs: update GP badges with localized badges. includes AI files for all badges in available languages

11 years agoam 7ed49126: am 13ef4e43: docs: update GP badges with localized badges. includes...
Scott Main [Tue, 8 Jan 2013 20:37:32 +0000 (12:37 -0800)]
am 7ed49126: am 13ef4e43: docs: update GP badges with localized badges. includes AI files for all badges in available languages

* commit '7ed491262736b96ebe643200cf385e38537ac967':
  docs: update GP badges with localized badges. includes AI files for all badges in available languages

11 years agoam 13ef4e43: docs: update GP badges with localized badges. includes AI files for...
Scott Main [Tue, 8 Jan 2013 20:34:26 +0000 (12:34 -0800)]
am 13ef4e43: docs: update GP badges with localized badges. includes AI files for all badges in available languages

* commit '13ef4e43ef3790cafd269b19e751f78504d7ac8c':
  docs: update GP badges with localized badges. includes AI files for all badges in available languages

11 years agoMerge "docs: resolve bugs from external tracker" into jb-mr1-dev
Scott Main [Tue, 8 Jan 2013 20:33:48 +0000 (12:33 -0800)]
Merge "docs: resolve bugs from external tracker" into jb-mr1-dev

11 years agodocs: update GP badges with localized badges.
Scott Main [Tue, 11 Dec 2012 01:35:50 +0000 (17:35 -0800)]
docs: update GP badges with localized badges.
includes AI files for all badges in available languages

Change-Id: Iff31696068fa2969f685f2bdab74eb737a22488c

11 years agodocs: resolve bugs from external tracker
Scott Main [Tue, 8 Jan 2013 02:51:49 +0000 (18:51 -0800)]
docs: resolve bugs from external tracker

Change-Id: I680970ec63701197103f6c5ab55c25c736aa0519

11 years agoam e71bb772: am f9719d11: am daf9b7d1: am 3f72bf32: Merge "Refactoring the media...
Jason Noguchi [Tue, 8 Jan 2013 03:22:03 +0000 (19:22 -0800)]
am e71bb772: am f9719d11: am daf9b7d1: am 3f72bf32: Merge "Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record durati

* commit 'e71bb7722b26ba2ada948ce3dbd626f14aabeb68':
  Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record duration to a full minute.

11 years agoam f9719d11: am daf9b7d1: am 3f72bf32: Merge "Refactoring the media recorder stress...
Jason Noguchi [Tue, 8 Jan 2013 03:19:02 +0000 (19:19 -0800)]
am f9719d11: am daf9b7d1: am 3f72bf32: Merge "Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record duration to a full

* commit 'f9719d116d560b74b4643a50e9f0c9cb6878daea':
  Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record duration to a full minute.

11 years agoam daf9b7d1: am 3f72bf32: Merge "Refactoring the media recorder stress test. Added...
Jason Noguchi [Tue, 8 Jan 2013 03:17:13 +0000 (19:17 -0800)]
am daf9b7d1: am 3f72bf32: Merge "Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record duration to a full minute." into

* commit 'daf9b7d1387d0bf4623f54827fef69b923645b42':
  Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record duration to a full minute.

11 years agoam 3f72bf32: Merge "Refactoring the media recorder stress test. Added test cases...
Jason Noguchi [Tue, 8 Jan 2013 03:15:16 +0000 (19:15 -0800)]
am 3f72bf32: Merge "Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record duration to a full minute." into jb-mr1-dev

* commit '3f72bf323f977b367ceaee5ace321098cb7b74f4':
  Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record duration to a full minute.

11 years agoMerge "Refactoring the media recorder stress test. Added test cases for: - record...
Jason Noguchi [Tue, 8 Jan 2013 03:11:32 +0000 (19:11 -0800)]
Merge "Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record duration to a full minute." into jb-mr1-dev

11 years agoam be6ff0b8: am 66480258: am ba5fd35e: am 7b4e597f: Merge "Adding camera scene mode...
Jason Noguchi [Tue, 8 Jan 2013 02:48:46 +0000 (18:48 -0800)]
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.

11 years agoam 66480258: am ba5fd35e: am 7b4e597f: Merge "Adding camera scene mode stress test...
Jason Noguchi [Tue, 8 Jan 2013 02:47:01 +0000 (18:47 -0800)]
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.

11 years agoam ba5fd35e: am 7b4e597f: Merge "Adding camera scene mode stress test." into jb-mr1-dev
Jason Noguchi [Tue, 8 Jan 2013 02:45:30 +0000 (18:45 -0800)]
am ba5fd35e: am 7b4e597f: Merge "Adding camera scene mode stress test." into jb-mr1-dev

* commit 'ba5fd35e24778c29ad0786d865c2cbdf3a5ab27d':
  Adding camera scene mode stress test.

11 years agoam 7b4e597f: Merge "Adding camera scene mode stress test." into jb-mr1-dev
Jason Noguchi [Tue, 8 Jan 2013 02:43:18 +0000 (18:43 -0800)]
am 7b4e597f: Merge "Adding camera scene mode stress test." into jb-mr1-dev

* commit '7b4e597faff3c469bdd5e7837155a5fc5ea036bc':
  Adding camera scene mode stress test.

11 years agoMerge "Adding camera scene mode stress test." into jb-mr1-dev
Jason Noguchi [Tue, 8 Jan 2013 02:40:27 +0000 (18:40 -0800)]
Merge "Adding camera scene mode stress test." into jb-mr1-dev

11 years agoam af6dd103: Merge "fix ImageView.getImageMatrix()" into jb-mr1-aah-dev
Dake Gu [Tue, 8 Jan 2013 02:13:30 +0000 (18:13 -0800)]
am af6dd103: Merge "fix ImageView.getImageMatrix()" into jb-mr1-aah-dev

* commit 'af6dd103bd2bb0783b9364c703c2623260496d5c':
  fix ImageView.getImageMatrix()

11 years agoMerge "fix ImageView.getImageMatrix()" into jb-mr1-aah-dev
Dake Gu [Tue, 8 Jan 2013 02:10:20 +0000 (18:10 -0800)]
Merge "fix ImageView.getImageMatrix()" into jb-mr1-aah-dev

11 years agoam 76c28e54: am 7fc128fe: am b2039756: am e30d31c4: docs: misc bugs from external...
Scott Main [Tue, 8 Jan 2013 00:06:40 +0000 (16:06 -0800)]
am 76c28e54: am 7fc128fe: am b2039756: am e30d31c4: docs: misc bugs from external tracker

* commit '76c28e54b876207d468309aecb2ff2f4708a6ca4':
  docs: misc bugs from external tracker

11 years agoam 7fc128fe: am b2039756: am e30d31c4: docs: misc bugs from external tracker
Scott Main [Tue, 8 Jan 2013 00:04:04 +0000 (16:04 -0800)]
am 7fc128fe: am b2039756: am e30d31c4: docs: misc bugs from external tracker

* commit '7fc128fef94273b82c66bd636ff7f9fced9a68db':
  docs: misc bugs from external tracker

11 years agoam b2039756: am e30d31c4: docs: misc bugs from external tracker
Scott Main [Tue, 8 Jan 2013 00:01:17 +0000 (16:01 -0800)]
am b2039756: am e30d31c4: docs: misc bugs from external tracker

* commit 'b203975610a8ebac9345aa381b008466389dfa33':
  docs: misc bugs from external tracker

11 years agoam c02bbfb3: am 9fae2ecc: Merge "Handle nested folder case"
Dianne Hackborn [Mon, 7 Jan 2013 23:58:43 +0000 (15:58 -0800)]
am c02bbfb3: am 9fae2ecc: Merge "Handle nested folder case"

* commit 'c02bbfb3ea64ec9f4f3e6eff796b0bfe571bda9b':
  Handle nested folder case

11 years agoam e30d31c4: docs: misc bugs from external tracker
Scott Main [Mon, 7 Jan 2013 23:58:19 +0000 (15:58 -0800)]
am e30d31c4: docs: misc bugs from external tracker

* commit 'e30d31c4e8439f8fa8647744cee93f1fd8b67407':
  docs: misc bugs from external tracker

11 years agoam 9fae2ecc: Merge "Handle nested folder case"
Dianne Hackborn [Mon, 7 Jan 2013 23:56:20 +0000 (15:56 -0800)]
am 9fae2ecc: Merge "Handle nested folder case"

* commit '9fae2ecc5fb777230bde74e4a099fb4e98bf34b4':
  Handle nested folder case

11 years agodocs: misc bugs from external tracker
Scott Main [Mon, 7 Jan 2013 23:54:30 +0000 (15:54 -0800)]
docs: misc bugs from external tracker

Change-Id: I928659b23d1ff3a5d017d4fb50acb8ac0e3b251b

11 years agoMerge "Handle nested folder case"
Dianne Hackborn [Mon, 7 Jan 2013 23:20:45 +0000 (15:20 -0800)]
Merge "Handle nested folder case"

11 years agoam 26c00dec: am b2d3904b: Merge "Setting the default value for dock audio"
Dianne Hackborn [Mon, 7 Jan 2013 21:53:12 +0000 (13:53 -0800)]
am 26c00dec: am b2d3904b: Merge "Setting the default value for dock audio"

* commit '26c00decb4c0352913396851c2b42a8705976614':
  Setting the default value for dock audio

11 years agoam b2d3904b: Merge "Setting the default value for dock audio"
Dianne Hackborn [Mon, 7 Jan 2013 21:26:38 +0000 (13:26 -0800)]
am b2d3904b: Merge "Setting the default value for dock audio"

* commit 'b2d3904b0d0f02b3eddef1d228724b99962cba56':
  Setting the default value for dock audio

11 years agoam 2a8de804: am 350d5168: Merge "Correcting typo in doc of MEDIA_XXX intents"
Dianne Hackborn [Mon, 7 Jan 2013 20:20:16 +0000 (12:20 -0800)]
am 2a8de804: am 350d5168: Merge "Correcting typo in doc of MEDIA_XXX intents"

* commit '2a8de804a2a8313fc4571a73c625d8213237b825':
  Correcting typo in doc of MEDIA_XXX intents

11 years agoam 138a3d3f: am d5d6f04f: Merge "Hopefully fix PendingIntent.getActivities() document...
Dianne Hackborn [Mon, 7 Jan 2013 20:19:58 +0000 (12:19 -0800)]
am 138a3d3f: am d5d6f04f: Merge "Hopefully fix PendingIntent.getActivities() documentation wtf."

* commit '138a3d3f1a7990606c5aa0cb92019dac8568f3ec':
  Hopefully fix PendingIntent.getActivities() documentation wtf.

11 years agoMerge "Setting the default value for dock audio"
Dianne Hackborn [Mon, 7 Jan 2013 20:17:25 +0000 (12:17 -0800)]
Merge "Setting the default value for dock audio"

11 years agoam 350d5168: Merge "Correcting typo in doc of MEDIA_XXX intents"
Dianne Hackborn [Mon, 7 Jan 2013 20:16:40 +0000 (12:16 -0800)]
am 350d5168: Merge "Correcting typo in doc of MEDIA_XXX intents"

* commit '350d5168e495c642873ee511d4e8dc27ac5377ce':
  Correcting typo in doc of MEDIA_XXX intents

11 years agoam d5d6f04f: Merge "Hopefully fix PendingIntent.getActivities() documentation wtf."
Dianne Hackborn [Mon, 7 Jan 2013 20:16:23 +0000 (12:16 -0800)]
am d5d6f04f: Merge "Hopefully fix PendingIntent.getActivities() documentation wtf."

* commit 'd5d6f04f2ab0db0aea03e3ab1cdd378fcc952bad':
  Hopefully fix PendingIntent.getActivities() documentation wtf.

11 years agoMerge "Correcting typo in doc of MEDIA_XXX intents"
Dianne Hackborn [Mon, 7 Jan 2013 19:21:54 +0000 (11:21 -0800)]
Merge "Correcting typo in doc of MEDIA_XXX intents"

11 years agoMerge "Hopefully fix PendingIntent.getActivities() documentation wtf."
Dianne Hackborn [Mon, 7 Jan 2013 19:19:11 +0000 (11:19 -0800)]
Merge "Hopefully fix PendingIntent.getActivities() documentation wtf."

11 years agoam f3b617fd: am bc522717: am 93a4ab2f: am 8f70a7c4: move the nsdchat sample to proper...
Scott Main [Sat, 5 Jan 2013 03:04:44 +0000 (19:04 -0800)]
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

11 years agoam bc522717: am 93a4ab2f: am 8f70a7c4: move the nsdchat sample to proper download...
Scott Main [Sat, 5 Jan 2013 03:02:09 +0000 (19:02 -0800)]
am bc522717: am 93a4ab2f: am 8f70a7c4: move the nsdchat sample to proper download directory

* commit 'bc522717a7bbb0284d6bc37858ddda499b5c0696':
  move the nsdchat sample to proper download directory

11 years agoam 93a4ab2f: am 8f70a7c4: move the nsdchat sample to proper download directory
Scott Main [Sat, 5 Jan 2013 02:59:30 +0000 (18:59 -0800)]
am 93a4ab2f: am 8f70a7c4: move the nsdchat sample to proper download directory

* commit '93a4ab2fa2efd8908c30298796af710c1ec0f85f':
  move the nsdchat sample to proper download directory

11 years agoam 79393df9: am bf85e053: am 4bc407e3: am 47e8d20d: move network usage sample zip
Scott Main [Sat, 5 Jan 2013 02:58:55 +0000 (18:58 -0800)]
am 79393df9: am bf85e053: am 4bc407e3: am 47e8d20d: move network usage sample zip

* commit '79393df90b6e1cd85673d204cc5fd7f1ed542981':
  move network usage sample zip

11 years agoam 8f70a7c4: move the nsdchat sample to proper download directory
Scott Main [Sat, 5 Jan 2013 02:57:18 +0000 (18:57 -0800)]
am 8f70a7c4: move the nsdchat sample to proper download directory

* commit '8f70a7c46cc3c4732b11fd8088b47c3434cf64d9':
  move the nsdchat sample to proper download directory

11 years agoam bf85e053: am 4bc407e3: am 47e8d20d: move network usage sample zip
Scott Main [Sat, 5 Jan 2013 02:56:40 +0000 (18:56 -0800)]
am bf85e053: am 4bc407e3: am 47e8d20d: move network usage sample zip

* commit 'bf85e0537d0df27ab5229b8745c59a995f560df5':
  move network usage sample zip

11 years agomove the nsdchat sample to proper download directory
Scott Main [Sat, 5 Jan 2013 02:54:08 +0000 (18:54 -0800)]
move the nsdchat sample to proper download directory

Change-Id: I9679e5642ffaa1baad104c5fa1c1f90b59a5b1ff

11 years agoam 4bc407e3: am 47e8d20d: move network usage sample zip
Scott Main [Sat, 5 Jan 2013 02:53:50 +0000 (18:53 -0800)]
am 4bc407e3: am 47e8d20d: move network usage sample zip

* commit '4bc407e3e1948bff1b57f552dba142d54191b264':
  move network usage sample zip

11 years agoam 47e8d20d: move network usage sample zip
Scott Main [Sat, 5 Jan 2013 02:51:32 +0000 (18:51 -0800)]
am 47e8d20d: move network usage sample zip

* commit '47e8d20d7b87be59ce38828659231afd425d05f8':
  move network usage sample zip

11 years agomove network usage sample zip
Scott Main [Sat, 5 Jan 2013 02:47:39 +0000 (18:47 -0800)]
move network usage sample zip

Change-Id: I4ed2ebe357d420fea20d69515d9e91dc73579bba

11 years agoam ff941423: am 181bb3aa: am 921c8a5d: am 4e483ed3: Merge "docs: misc bug fixes....
Scott Main [Sat, 5 Jan 2013 02:26:14 +0000 (18:26 -0800)]
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

11 years agoam 181bb3aa: am 921c8a5d: am 4e483ed3: Merge "docs: misc bug fixes. including importa...
Scott Main [Sat, 5 Jan 2013 02:23:58 +0000 (18:23 -0800)]
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

11 years agoam 921c8a5d: am 4e483ed3: Merge "docs: misc bug fixes. including important versioning...
Scott Main [Sat, 5 Jan 2013 02:20:57 +0000 (18:20 -0800)]
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

11 years agoam 4e483ed3: Merge "docs: misc bug fixes. including important versioning fixes for...
Scott Main [Sat, 5 Jan 2013 02:19:00 +0000 (18:19 -0800)]
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

11 years agoMerge "docs: misc bug fixes. including important versioning fixes for first app class...
Scott Main [Sat, 5 Jan 2013 02:16:15 +0000 (18:16 -0800)]
Merge "docs: misc bug fixes. including important versioning fixes for first app class" into jb-mr1-dev

11 years agodocs: misc bug fixes. including important versioning fixes for first app class
Scott Main [Sat, 5 Jan 2013 01:41:54 +0000 (17:41 -0800)]
docs: misc bug fixes. including important versioning fixes for first app class

Change-Id: Ifda2509fc90dd795bfd6c5e9b3d7eebcbd77892a

11 years agoam dcab3ee6: am 78971634: am 928d2634: am 2b13a475: Doc update: fixed manifest typo...
Katie McCormick [Sat, 5 Jan 2013 00:42:06 +0000 (16:42 -0800)]
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

11 years agoam 78971634: am 928d2634: am 2b13a475: Doc update: fixed manifest typo in Network zip
Katie McCormick [Sat, 5 Jan 2013 00:39:35 +0000 (16:39 -0800)]
am 78971634: am 928d2634: am 2b13a475: Doc update: fixed manifest typo in Network zip

* commit '789716346ac21248efa37d3a7eadad854bbff350':
  Doc update: fixed manifest typo in Network zip

11 years agoam 928d2634: am 2b13a475: Doc update: fixed manifest typo in Network zip
Katie McCormick [Sat, 5 Jan 2013 00:36:48 +0000 (16:36 -0800)]
am 928d2634: am 2b13a475: Doc update: fixed manifest typo in Network zip

* commit '928d2634ff9084ffc9d041b06fd7945cd8463801':
  Doc update: fixed manifest typo in Network zip

11 years agoam 2b13a475: Doc update: fixed manifest typo in Network zip
Katie McCormick [Sat, 5 Jan 2013 00:34:19 +0000 (16:34 -0800)]
am 2b13a475: Doc update: fixed manifest typo in Network zip

* commit '2b13a475409aa28890c93088e86c065da1b07044':
  Doc update: fixed manifest typo in Network zip

11 years agoDoc update: fixed manifest typo in Network zip
Katie McCormick [Sat, 5 Jan 2013 00:17:45 +0000 (16:17 -0800)]
Doc update: fixed manifest typo in Network zip

Change-Id: Iccf6dbce9d975337ab23b26dce63d3ec31303320

11 years agoam bc7d5a55: am 537fb0af: Merge "Use most specific attributes for distinguished name...
Brian Carlstrom [Fri, 4 Jan 2013 23:51:09 +0000 (15:51 -0800)]
am bc7d5a55: am 537fb0af: Merge "Use most specific attributes for distinguished name display"

* commit 'bc7d5a55b22ce30af250cc7468b6c5987cd25dfd':
  Use most specific attributes for distinguished name display

11 years agoam 537fb0af: Merge "Use most specific attributes for distinguished name display"
Brian Carlstrom [Fri, 4 Jan 2013 23:47:39 +0000 (15:47 -0800)]
am 537fb0af: Merge "Use most specific attributes for distinguished name display"

* commit '537fb0afe24a520e7b9a2442786b6fb4fe194392':
  Use most specific attributes for distinguished name display

11 years agoMerge "Use most specific attributes for distinguished name display"
Brian Carlstrom [Fri, 4 Jan 2013 23:40:34 +0000 (15:40 -0800)]
Merge "Use most specific attributes for distinguished name display"

11 years agoUse most specific attributes for distinguished name display
Brian Carlstrom [Sat, 22 Dec 2012 01:28:04 +0000 (17:28 -0800)]
Use most specific attributes for distinguished name display

Bug: 7894348
Bug: http://code.google.com/p/android/issues/detail?id=41662
Change-Id: I8048a53b8a9a17b384f12b6a4f40071bb3dd3e04

11 years agoam 105a581b: am 75420403: am 7edf8074: am 197d0a66: Merge "docs: update sony driver...
Scott Main [Fri, 4 Jan 2013 19:40:38 +0000 (11:40 -0800)]
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

11 years agoam 75420403: am 7edf8074: am 197d0a66: Merge "docs: update sony driver link and name...
Scott Main [Fri, 4 Jan 2013 19:38:52 +0000 (11:38 -0800)]
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

11 years agoam 7edf8074: am 197d0a66: Merge "docs: update sony driver link and name bug: 6566732...
Scott Main [Fri, 4 Jan 2013 19:36:41 +0000 (11:36 -0800)]
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

11 years agoam 197d0a66: Merge "docs: update sony driver link and name bug: 6566732" into jb...
Scott Main [Fri, 4 Jan 2013 19:33:59 +0000 (11:33 -0800)]
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

11 years agoMerge "docs: update sony driver link and name bug: 6566732" into jb-mr1-dev
Scott Main [Fri, 4 Jan 2013 19:29:11 +0000 (11:29 -0800)]
Merge "docs: update sony driver link and name bug: 6566732" into jb-mr1-dev

11 years agodocs: update sony driver link and name
Scott Main [Fri, 4 Jan 2013 19:06:40 +0000 (11:06 -0800)]
docs: update sony driver link and name
bug: 6566732

Change-Id: I8cb6e3295a24a7876d9cc9493889d85688357f79

11 years agoam 7ae93164: am 29618824: am e478fb4f: am 6b79e954: Merge "docs: update gms and gcm...
Robert Ly [Fri, 4 Jan 2013 19:11:29 +0000 (11:11 -0800)]
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

11 years agoam 29618824: am e478fb4f: am 6b79e954: Merge "docs: update gms and gcm javadocs with...
Robert Ly [Fri, 4 Jan 2013 19:09:07 +0000 (11:09 -0800)]
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

11 years agoam e478fb4f: am 6b79e954: Merge "docs: update gms and gcm javadocs with new TOC"...
Robert Ly [Fri, 4 Jan 2013 19:06:15 +0000 (11:06 -0800)]
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

11 years agoam 6b79e954: Merge "docs: update gms and gcm javadocs with new TOC" into jb-mr1-dev
Robert Ly [Fri, 4 Jan 2013 19:03:04 +0000 (11:03 -0800)]
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

11 years agoMerge "docs: update gms and gcm javadocs with new TOC" into jb-mr1-dev
Robert Ly [Fri, 4 Jan 2013 18:58:55 +0000 (10:58 -0800)]
Merge "docs: update gms and gcm javadocs with new TOC" into jb-mr1-dev

11 years agodocs: update gms and gcm javadocs with new TOC
Robert Ly [Fri, 4 Jan 2013 18:13:35 +0000 (10:13 -0800)]
docs: update gms and gcm javadocs with new TOC

Change-Id: Ic54c4e4e6e2b0008450abe9d3aa1ae53535d9160

11 years agoCorrecting typo in doc of MEDIA_XXX intents
suyi Yuan [Fri, 4 Jan 2013 13:21:59 +0000 (21:21 +0800)]
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

11 years agoam 81cfb63e: am d13b23a4: Merge "Revert "fix potential memory leak""
Elliott Hughes [Fri, 4 Jan 2013 02:50:08 +0000 (18:50 -0800)]
am 81cfb63e: am d13b23a4: Merge "Revert "fix potential memory leak""

* commit '81cfb63e9fc6ef72e5b488225fe9b7a43551fc9e':
  Revert "fix potential memory leak"

11 years agoam 767e1c01: am 9aac0c1b: Merge "fix potential memory leak"
Elliott Hughes [Fri, 4 Jan 2013 02:50:03 +0000 (18:50 -0800)]
am 767e1c01: am 9aac0c1b: Merge "fix potential memory leak"

* commit '767e1c010c0664fa4bf7e7e32b840af4bbe0b0cf':
  fix potential memory leak

11 years agoam d13b23a4: Merge "Revert "fix potential memory leak""
Elliott Hughes [Fri, 4 Jan 2013 02:47:37 +0000 (18:47 -0800)]
am d13b23a4: Merge "Revert "fix potential memory leak""

* commit 'd13b23a436075262cc83f7502f7159de24546003':
  Revert "fix potential memory leak"

11 years agoam 9aac0c1b: Merge "fix potential memory leak"
Elliott Hughes [Fri, 4 Jan 2013 02:47:32 +0000 (18:47 -0800)]
am 9aac0c1b: Merge "fix potential memory leak"

* commit '9aac0c1b35ec666a18f320be99e6aa37d0bcf202':
  fix potential memory leak

11 years agoam 834b0f3c: am 19b17b41: am 38a642e9: am 3e2479dd: Merge "docs: fix broken links...
Scott Main [Fri, 4 Jan 2013 02:44:22 +0000 (18:44 -0800)]
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

11 years agoam 19b17b41: am 38a642e9: am 3e2479dd: Merge "docs: fix broken links and add new...
Scott Main [Fri, 4 Jan 2013 02:42:05 +0000 (18:42 -0800)]
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

11 years agoHandle nested folder case
Roger Chen [Mon, 17 Dec 2012 05:31:17 +0000 (13:31 +0800)]
Handle nested folder case

Change-Id: Id6d6a5899e8255d18192adbc766d8d9a0e6825d0
Signed-off-by: Roger Chen <cxr514033970@gmail.com>