OSDN Git Service

android-x86/frameworks-base.git
11 years agoam c1de2404: Merge "Update documentation of NEW_OUTGOING_CALL" into jb-mr2-dev
Santos Cordon [Sat, 18 May 2013 00:16:45 +0000 (17:16 -0700)]
am c1de2404: Merge "Update documentation of NEW_OUTGOING_CALL" into jb-mr2-dev

* commit 'c1de240457ad803c04c56fb3f63635966b862b43':
  Update documentation of NEW_OUTGOING_CALL

11 years agoMerge "Update documentation of NEW_OUTGOING_CALL" into jb-mr2-dev
Santos Cordon [Sat, 18 May 2013 00:14:13 +0000 (00:14 +0000)]
Merge "Update documentation of NEW_OUTGOING_CALL" into jb-mr2-dev

11 years agoUpdate documentation of NEW_OUTGOING_CALL
Santos Cordon [Fri, 17 May 2013 21:48:54 +0000 (14:48 -0700)]
Update documentation of NEW_OUTGOING_CALL

Adds call-handling as a use case for NEW_OUTGOING_CALL

bug: 8987211
Change-Id: Icd9c53a2dd1a5948a749e133600db21c2560fd1f

11 years agoam 743054f5: Merge "disable notification listeners on uninstall" into jb-mr2-dev
Chris Wren [Fri, 17 May 2013 22:08:19 +0000 (15:08 -0700)]
am 743054f5: Merge "disable notification listeners on uninstall" into jb-mr2-dev

* commit '743054f5b3ad088b00adac44bb6d1f542d4375db':
  disable notification listeners on uninstall

11 years agoMerge "disable notification listeners on uninstall" into jb-mr2-dev
Chris Wren [Fri, 17 May 2013 22:06:13 +0000 (22:06 +0000)]
Merge "disable notification listeners on uninstall" into jb-mr2-dev

11 years agoam 4361e1f4: Remove assist swipe from TOUCH_NAVIGATION devices
Michael Wright [Fri, 17 May 2013 21:57:25 +0000 (14:57 -0700)]
am 4361e1f4: Remove assist swipe from TOUCH_NAVIGATION devices

* commit '4361e1f46ef9e30c78679b5e2717b74d66191692':
  Remove assist swipe from TOUCH_NAVIGATION devices

11 years agoRemove assist swipe from TOUCH_NAVIGATION devices
Michael Wright [Fri, 17 May 2013 21:25:52 +0000 (14:25 -0700)]
Remove assist swipe from TOUCH_NAVIGATION devices

Bug: 9019927
Change-Id: I0a67ee00038b6fba7818f64ba02515767e34fe06
(cherry picked from commit 681a3d710402b80a8375a05172b1fb6f720295be)

11 years agoam 3c1ad55f: Merge "Update Canvas.getClipBounds to not account for AA clips." into...
Romain Guy [Fri, 17 May 2013 21:12:43 +0000 (14:12 -0700)]
am 3c1ad55f: Merge "Update Canvas.getClipBounds to not account for AA clips." into jb-mr2-dev

* commit '3c1ad55fcfa54c2c30073d07917da699d156dc58':
  Update Canvas.getClipBounds to not account for AA clips.

11 years agoMerge "Update Canvas.getClipBounds to not account for AA clips." into jb-mr2-dev
Romain Guy [Fri, 17 May 2013 21:10:21 +0000 (21:10 +0000)]
Merge "Update Canvas.getClipBounds to not account for AA clips." into jb-mr2-dev

11 years agoam d31db759: Merge "Fix issue #9000597: PackageManager get NPE while running performa...
Dianne Hackborn [Fri, 17 May 2013 20:34:30 +0000 (13:34 -0700)]
am d31db759: Merge "Fix issue #9000597: PackageManager get NPE while running performance plan" into jb-mr2-dev

* commit 'd31db759cba78447ba1f4286a84c27a30a5aeb5c':
  Fix issue #9000597: PackageManager get NPE while running performance plan

11 years agoMerge "Fix issue #9000597: PackageManager get NPE while running performance plan...
Dianne Hackborn [Fri, 17 May 2013 20:31:44 +0000 (20:31 +0000)]
Merge "Fix issue #9000597: PackageManager get NPE while running performance plan" into jb-mr2-dev

11 years agodisable notification listeners on uninstall
Chris Wren [Wed, 15 May 2013 18:50:28 +0000 (14:50 -0400)]
disable notification listeners on uninstall

Bug: 8979640
Change-Id: I9f1d118e5ce210b829476e0971f3d55fc778c227

11 years agoReconcile with jb-mr2-release - do not merge
The Android Open Source Project [Fri, 17 May 2013 19:54:33 +0000 (12:54 -0700)]
Reconcile with jb-mr2-release - do not merge

Change-Id: Id080dc52375e30cfad7c1b6df9be754c2bb8c6fa

11 years agoam 50ab525a: Merge "Add route description API." into jb-mr2-dev
Jeff Brown [Fri, 17 May 2013 19:44:37 +0000 (12:44 -0700)]
am 50ab525a: Merge "Add route description API." into jb-mr2-dev

* commit '50ab525af62ef5e1f9cf3433a161f2e874da6116':
  Add route description API.

11 years agoMerge "Add route description API." into jb-mr2-dev
Jeff Brown [Fri, 17 May 2013 19:41:10 +0000 (19:41 +0000)]
Merge "Add route description API." into jb-mr2-dev

11 years agoam 9cd4e67e: Import translations. DO NOT MERGE
Baligh Uddin [Fri, 17 May 2013 19:09:28 +0000 (12:09 -0700)]
am 9cd4e67e: Import translations. DO NOT MERGE

* commit '9cd4e67e10f86710734db5e2e8659e1346f3c041':
  Import translations. DO NOT MERGE

11 years agoFix issue #9000597: PackageManager get NPE while running performance plan
Dianne Hackborn [Fri, 17 May 2013 19:07:21 +0000 (12:07 -0700)]
Fix issue #9000597: PackageManager get NPE while running performance plan

Change-Id: I2bf777e8b15704d21320f95059d94648122396a8

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 17 May 2013 17:13:15 +0000 (10:13 -0700)]
Import translations. DO NOT MERGE

Change-Id: I842a1c08ad79a01566a9abc1a9893ff3f0547846
Auto-generated-cl: translation import

11 years agoam ecd3f2d7: am eec9bc2f: am ec5c93e0: am df82d256: add info about Windows issue...
Scott Main [Fri, 17 May 2013 03:45:47 +0000 (20:45 -0700)]
am ecd3f2d7: am eec9bc2f: am ec5c93e0: am df82d256: add info about Windows issue and link to issues page

* commit 'ecd3f2d729188a869c3dfa771ba050e4caaf0dbb':
  add info about Windows issue and link to issues page

11 years agoam eec9bc2f: am ec5c93e0: am df82d256: add info about Windows issue and link to issue...
Scott Main [Fri, 17 May 2013 01:07:22 +0000 (18:07 -0700)]
am eec9bc2f: am ec5c93e0: am df82d256: add info about Windows issue and link to issues page

* commit 'eec9bc2f567f037225e9bea1d0facebeb98a183d':
  add info about Windows issue and link to issues page

11 years agoam ec5c93e0: am df82d256: add info about Windows issue and link to issues page
Scott Main [Fri, 17 May 2013 01:05:13 +0000 (18:05 -0700)]
am ec5c93e0: am df82d256: add info about Windows issue and link to issues page

* commit 'ec5c93e0ecd92223a20c049b03f183c588391592':
  add info about Windows issue and link to issues page

11 years agoam df82d256: add info about Windows issue and link to issues page
Scott Main [Fri, 17 May 2013 01:03:12 +0000 (18:03 -0700)]
am df82d256: add info about Windows issue and link to issues page

* commit 'df82d256592d6743e400ccf1c82822ddb56fefbe':
  add info about Windows issue and link to issues page

11 years agoadd info about Windows issue and link to issues page
Scott Main [Fri, 17 May 2013 00:58:11 +0000 (17:58 -0700)]
add info about Windows issue and link to issues page

Change-Id: I07f1962fd00fc87c783e090f3e6986449f7b6f7c

11 years agoAdd min delay between disable and enable of wifi
Robert Greenwalt [Thu, 16 May 2013 19:48:20 +0000 (12:48 -0700)]
Add min delay between disable and enable of wifi

We sometimes have issues if disable, enable seq happens to fast.
This should only slow down those fast cases.

bug:8715336
Change-Id: I4f7fe9708b7c3c2300c441511838e8a70eaad5d1

11 years agoam 03fe26d5: am d7088026: am 26ab3060: am c452f1e2: add nav drawer icon zip
Scott Main [Thu, 16 May 2013 22:14:09 +0000 (15:14 -0700)]
am 03fe26d5: am d7088026: am 26ab3060: am c452f1e2: add nav drawer icon zip

* commit '03fe26d5b151bc9ad1c6913edb618e666b1c9b89':
  add nav drawer icon zip

11 years agoam d7088026: am 26ab3060: am c452f1e2: add nav drawer icon zip
Scott Main [Thu, 16 May 2013 22:12:11 +0000 (15:12 -0700)]
am d7088026: am 26ab3060: am c452f1e2: add nav drawer icon zip

* commit 'd708802698baea82136c12e8a4cee805ab0b3efb':
  add nav drawer icon zip

11 years agoam 26ab3060: am c452f1e2: add nav drawer icon zip
Scott Main [Thu, 16 May 2013 22:09:40 +0000 (15:09 -0700)]
am 26ab3060: am c452f1e2: add nav drawer icon zip

* commit '26ab3060ad402204c8a50e184c3947a897667642':
  add nav drawer icon zip

11 years agoam c452f1e2: add nav drawer icon zip
Scott Main [Thu, 16 May 2013 22:07:46 +0000 (15:07 -0700)]
am c452f1e2: add nav drawer icon zip

* commit 'c452f1e251ca7aa26a2cfbb04e2f1086f18ca5df':
  add nav drawer icon zip

11 years agoadd nav drawer icon zip
Scott Main [Thu, 16 May 2013 22:02:02 +0000 (15:02 -0700)]
add nav drawer icon zip

Change-Id: I1eef61cb27ec2b50c88d6d8aa3a34495e2d4c029

11 years agoAdd route description API.
Jeff Brown [Thu, 16 May 2013 02:00:29 +0000 (19:00 -0700)]
Add route description API.

Bug: 8175766
Change-Id: I65dbc10fc04f9ff8f6abc1bda23fbf5baa227737

11 years agoam c12783a9: Add min delay between disable and enable of wifi
Robert Greenwalt [Thu, 16 May 2013 21:02:49 +0000 (14:02 -0700)]
am c12783a9: Add min delay between disable and enable of wifi

* commit 'c12783a90e08bd2e20eb75f68192fbf7bad80357':
  Add min delay between disable and enable of wifi

11 years agoAdd min delay between disable and enable of wifi
Robert Greenwalt [Thu, 16 May 2013 19:48:20 +0000 (12:48 -0700)]
Add min delay between disable and enable of wifi

We sometimes have issues if disable, enable seq happens to fast.
This should only slow down those fast cases.

bug:8715336
Change-Id: I4f7fe9708b7c3c2300c441511838e8a70eaad5d1

11 years agoam c037282c: Merge "Rebind notification listeners for current user." into jb-mr2-dev
John Spurlock [Thu, 16 May 2013 18:09:15 +0000 (11:09 -0700)]
am c037282c: Merge "Rebind notification listeners for current user." into jb-mr2-dev

* commit 'c037282c1ca0d7589168c73f1cf8b19ecc3ffca4':
  Rebind notification listeners for current user.

11 years agoMerge "Rebind notification listeners for current user." into jb-mr2-dev
John Spurlock [Thu, 16 May 2013 18:06:36 +0000 (18:06 +0000)]
Merge "Rebind notification listeners for current user." into jb-mr2-dev

11 years agoam 15e102cf: am 6658de78: am 14f1a995: am 67823512: add links to nav drawer icons
Scott Main [Thu, 16 May 2013 17:57:20 +0000 (10:57 -0700)]
am 15e102cf: am 6658de78: am 14f1a995: am 67823512: add links to nav drawer icons

* commit '15e102cf3b425484ca4eaf4d8bdab93c30d46f59':
  add links to nav drawer icons

11 years agoam 6658de78: am 14f1a995: am 67823512: add links to nav drawer icons
Scott Main [Thu, 16 May 2013 17:55:10 +0000 (10:55 -0700)]
am 6658de78: am 14f1a995: am 67823512: add links to nav drawer icons

* commit '6658de781b3826513f26383f261ad18d4cd096da':
  add links to nav drawer icons

11 years agoam 14f1a995: am 67823512: add links to nav drawer icons
Scott Main [Thu, 16 May 2013 17:52:04 +0000 (10:52 -0700)]
am 14f1a995: am 67823512: add links to nav drawer icons

* commit '14f1a9959311258eea47d1fd1c30b82ceddc9808':
  add links to nav drawer icons

11 years agoam 67823512: add links to nav drawer icons
Scott Main [Thu, 16 May 2013 17:50:13 +0000 (10:50 -0700)]
am 67823512: add links to nav drawer icons

* commit '678235122bb61304a36731e7a4ab1f4ad666980f':
  add links to nav drawer icons

11 years agoadd links to nav drawer icons
Scott Main [Thu, 16 May 2013 17:41:15 +0000 (10:41 -0700)]
add links to nav drawer icons

Change-Id: I97cf24421542d70402488f8c193c7bcc7ef7edd5

11 years agoRebind notification listeners for current user.
John Spurlock [Thu, 16 May 2013 17:42:38 +0000 (13:42 -0400)]
Rebind notification listeners for current user.

Use ForUser overload when reading setting inside system server.

Bug: 9000206
Change-Id: Ie87aed578d29425d8f32b23aeb8aa7118922c889

11 years agoam 82040986: Merge "Premium SMS popup for ISIS"
John Huang [Thu, 16 May 2013 15:47:19 +0000 (08:47 -0700)]
am 82040986: Merge "Premium SMS popup for ISIS"

* commit '82040986598b848830b00a068cf80c228957e173':
  Premium SMS popup for ISIS

11 years agoam 02ea97b5: am f7089ab0: am d73dee30: am a012887a: Merge "Doc change: change contact...
Dirk Dougherty [Thu, 16 May 2013 15:25:52 +0000 (08:25 -0700)]
am 02ea97b5: am f7089ab0: am d73dee30: am a012887a: Merge "Doc change: change contact form for optimization tips review decisions." into jb-mr1.1-ub-dev

* commit '02ea97b592f453e1faf591acafe374bca74d0de4':
  Doc change: change contact form for optimization tips review decisions.

11 years agoam f7089ab0: am d73dee30: am a012887a: Merge "Doc change: change contact form for...
Dirk Dougherty [Thu, 16 May 2013 15:24:02 +0000 (08:24 -0700)]
am f7089ab0: am d73dee30: am a012887a: Merge "Doc change: change contact form for optimization tips review decisions." into jb-mr1.1-ub-dev

* commit 'f7089ab0062b3db9858012330501cedcab3739cd':
  Doc change: change contact form for optimization tips review decisions.

11 years agoUpdate Canvas.getClipBounds to not account for AA clips.
Derek Sollenberger [Thu, 16 May 2013 13:31:27 +0000 (09:31 -0400)]
Update Canvas.getClipBounds to not account for AA clips.

This preserves the existing behavior at the SDK level while skia
investigates a more comprehensive solution.

bug: 8986473
Change-Id: Ief82dcfd47f1ba08d28d43402b3c28694f94f2e4

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Thu, 16 May 2013 12:55:35 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoReconcile with jb-mr2-release - do not merge
The Android Open Source Project [Thu, 16 May 2013 12:43:31 +0000 (05:43 -0700)]
Reconcile with jb-mr2-release - do not merge

Change-Id: Id3816eec8bf8ceef1883fab3f81803177588eed1

11 years agoam d73dee30: am a012887a: Merge "Doc change: change contact form for optimization...
Dirk Dougherty [Thu, 16 May 2013 07:35:37 +0000 (00:35 -0700)]
am d73dee30: am a012887a: Merge "Doc change: change contact form for optimization tips review decisions." into jb-mr1.1-ub-dev

* commit 'd73dee305b7b3b75fe2b6d5d4a99e35d65e06f85':
  Doc change: change contact form for optimization tips review decisions.

11 years agoam a012887a: Merge "Doc change: change contact form for optimization tips review...
Dirk Dougherty [Thu, 16 May 2013 07:33:29 +0000 (00:33 -0700)]
am a012887a: Merge "Doc change: change contact form for optimization tips review decisions." into jb-mr1.1-ub-dev

* commit 'a012887a7856c29e77cd9b08fab16a6c26c93c57':
  Doc change: change contact form for optimization tips review decisions.

11 years agoMerge "Doc change: change contact form for optimization tips review decisions." into...
Dirk Dougherty [Thu, 16 May 2013 07:31:53 +0000 (07:31 +0000)]
Merge "Doc change: change contact form for optimization tips review decisions." into jb-mr1.1-ub-dev

11 years agoDoc change: change contact form for optimization tips review decisions.
Dirk Dougherty [Thu, 16 May 2013 07:27:42 +0000 (00:27 -0700)]
Doc change: change contact form for optimization tips review decisions.

Change-Id: Ib4d5c5d4a5d078fb7b5612d5908515032e69f565

11 years agoMerge "Premium SMS popup for ISIS"
John Huang [Thu, 16 May 2013 02:31:43 +0000 (02:31 +0000)]
Merge "Premium SMS popup for ISIS"

11 years agoPremium SMS popup for ISIS
Sangcheol Lee [Fri, 26 Apr 2013 07:03:24 +0000 (16:03 +0900)]
Premium SMS popup for ISIS

Premium SMS popup warning during ISIS Wallet activation must be removed

Change-Id: Ib0bd4b1f2ee37abc8becc64e20ae73337f0381aa

11 years agoam 94160cd1: am 93657665: am 65b68f4a: am 0c39152f: add tags to lessons in navigation...
Scott Main [Wed, 15 May 2013 21:54:11 +0000 (14:54 -0700)]
am 94160cd1: am 93657665: am 65b68f4a: am 0c39152f: add tags to lessons in navigation class

* commit '94160cd1d72ee0d74ddd70298811cbe16e2ef0db':
  add tags to lessons in navigation class

11 years agoam 93657665: am 65b68f4a: am 0c39152f: add tags to lessons in navigation class
Scott Main [Wed, 15 May 2013 21:52:39 +0000 (14:52 -0700)]
am 93657665: am 65b68f4a: am 0c39152f: add tags to lessons in navigation class

* commit '93657665845a61ccf33a81e62a922163234b8cb3':
  add tags to lessons in navigation class

11 years agoam 65b68f4a: am 0c39152f: add tags to lessons in navigation class
Scott Main [Wed, 15 May 2013 21:50:03 +0000 (14:50 -0700)]
am 65b68f4a: am 0c39152f: add tags to lessons in navigation class

* commit '65b68f4a760dc029805aff5f1fa804a3420ac38c':
  add tags to lessons in navigation class

11 years agoam 0c39152f: add tags to lessons in navigation class
Scott Main [Wed, 15 May 2013 21:47:44 +0000 (14:47 -0700)]
am 0c39152f: add tags to lessons in navigation class

* commit '0c39152fc6847c8332aed46fd944579806d583df':
  add tags to lessons in navigation class

11 years agoadd tags to lessons in navigation class
Scott Main [Wed, 15 May 2013 21:38:16 +0000 (14:38 -0700)]
add tags to lessons in navigation class

Change-Id: Icab52c7aa3069b4cf700a9f2bc84a6d833b48621

11 years agoam bee0495f: Merge "Dirty rect must expand, not contract." into jb-mr2-dev
Chet Haase [Wed, 15 May 2013 20:35:09 +0000 (13:35 -0700)]
am bee0495f: Merge "Dirty rect must expand, not contract." into jb-mr2-dev

* commit 'bee0495fa17b7e385d880f18e510e295c000cfa9':
  Dirty rect must expand, not contract.

11 years agoam 21403857: Merge "Fix for bug 8911390 RTL text alignment is changed ..." into jb...
Raph Levien [Wed, 15 May 2013 20:35:06 +0000 (13:35 -0700)]
am 21403857: Merge "Fix for bug 8911390 RTL text alignment is changed ..." into jb-mr2-dev

* commit '214038571992a4ba65531297bf4a89af9a0b5fd4':
  Fix for bug 8911390 RTL text alignment is changed ...

11 years agoam 5f46f16e: am 47dbcfe4: am 023a70da: am c92ce29f: typo
Scott Main [Wed, 15 May 2013 20:35:03 +0000 (13:35 -0700)]
am 5f46f16e: am 47dbcfe4: am 023a70da: am c92ce29f: typo

* commit '5f46f16e040163bb5fe9ed841a3d11312d10af01':
  typo

11 years agoam 5720da0e: am b09a6e9c: am 0a008991: am 98599ee7: final android studio package...
Scott Main [Wed, 15 May 2013 20:35:01 +0000 (13:35 -0700)]
am 5720da0e: am b09a6e9c: am 0a008991: am 98599ee7: final android studio package info

* commit '5720da0e85b05a988c6262e737ba9a8228bd669c':
  final android studio package info

11 years agoam b865d578: Merge "Opt-in Settings package to see restricted accounts" into jb-mr2-dev
Amith Yamasani [Wed, 15 May 2013 20:34:55 +0000 (13:34 -0700)]
am b865d578: Merge "Opt-in Settings package to see restricted accounts" into jb-mr2-dev

* commit 'b865d578158150a13ca080c2525091a7722e75e3':
  Opt-in Settings package to see restricted accounts

11 years agoMerge "Dirty rect must expand, not contract." into jb-mr2-dev
Chet Haase [Wed, 15 May 2013 17:56:01 +0000 (17:56 +0000)]
Merge "Dirty rect must expand, not contract." into jb-mr2-dev

11 years agoMerge "Fix for bug 8911390 RTL text alignment is changed ..." into jb-mr2-dev
Raph Levien [Wed, 15 May 2013 17:44:16 +0000 (17:44 +0000)]
Merge "Fix for bug 8911390 RTL text alignment is changed ..." into jb-mr2-dev

11 years agoam 47dbcfe4: am 023a70da: am c92ce29f: typo
Scott Main [Wed, 15 May 2013 17:42:36 +0000 (10:42 -0700)]
am 47dbcfe4: am 023a70da: am c92ce29f: typo

* commit '47dbcfe4ed4922f6b6ece5f46edb13b1fc66f971':
  typo

11 years agoam b09a6e9c: am 0a008991: am 98599ee7: final android studio package info
Scott Main [Wed, 15 May 2013 17:42:33 +0000 (10:42 -0700)]
am b09a6e9c: am 0a008991: am 98599ee7: final android studio package info

* commit 'b09a6e9cfe847db59a3a16869bfe3b4333bc81df':
  final android studio package info

11 years agoam a34b531b: Merge "EthernetDataTracker: Set network available on connected"
Robert Greenwalt [Wed, 15 May 2013 17:41:54 +0000 (10:41 -0700)]
am a34b531b: Merge "EthernetDataTracker: Set network available on connected"

* commit 'a34b531bb6d2f2923f474b8c0a0c09149303e5d3':
  EthernetDataTracker: Set network available on connected

11 years agoam 023a70da: am c92ce29f: typo
Scott Main [Wed, 15 May 2013 17:40:26 +0000 (10:40 -0700)]
am 023a70da: am c92ce29f: typo

* commit '023a70daa1c5b2bc0526fc75a7ea92626f476747':
  typo

11 years agoam 0a008991: am 98599ee7: final android studio package info
Scott Main [Wed, 15 May 2013 17:40:23 +0000 (10:40 -0700)]
am 0a008991: am 98599ee7: final android studio package info

* commit '0a0089913292eaa099fcca78efc2c06e76d13f22':
  final android studio package info

11 years agoam c92ce29f: typo
Scott Main [Wed, 15 May 2013 17:38:50 +0000 (10:38 -0700)]
am c92ce29f: typo

* commit 'c92ce29fe59d0ac0693847a6ac68bdadc507f1e7':
  typo

11 years agoam 98599ee7: final android studio package info
Scott Main [Wed, 15 May 2013 17:38:47 +0000 (10:38 -0700)]
am 98599ee7: final android studio package info

* commit '98599ee71eb1af403cd2f122dafc53c7aa380335':
  final android studio package info

11 years agoMerge "Opt-in Settings package to see restricted accounts" into jb-mr2-dev
Amith Yamasani [Wed, 15 May 2013 17:05:44 +0000 (17:05 +0000)]
Merge "Opt-in Settings package to see restricted accounts" into jb-mr2-dev

11 years agoMerge "EthernetDataTracker: Set network available on connected"
Robert Greenwalt [Wed, 15 May 2013 16:39:05 +0000 (16:39 +0000)]
Merge "EthernetDataTracker: Set network available on connected"

11 years agotypo
Scott Main [Wed, 15 May 2013 16:09:11 +0000 (09:09 -0700)]
typo

Change-Id: I3d8ea3b012d530b4f9212fbac159fce37cf36a03

11 years agofinal android studio package info
Scott Main [Wed, 15 May 2013 15:45:39 +0000 (08:45 -0700)]
final android studio package info

Change-Id: I1ec2c09e46c0eb563d6be3eda3fa92e1d692378d

11 years agoam 1b173c6d: am 0f5d1391: am b7059861: am 2694897a: am 787cbb37: am 9a51dfd4: Merge...
Dirk Dougherty [Wed, 15 May 2013 14:39:49 +0000 (07:39 -0700)]
am 1b173c6d: am 0f5d1391: am b7059861: am 2694897a: am 787cbb37: am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs

* commit '1b173c6d5dceac14a42e6bf92980d0e247f5ccbc':
  Doc change: add redirects for edu urls.

11 years agoam 7b2fba2f: am 997d0042: am aa0acfc8: am 231e2474: Merge commit \'c3069c26\' into...
Dirk Dougherty [Wed, 15 May 2013 14:39:46 +0000 (07:39 -0700)]
am 7b2fba2f: am 997d0042: am aa0acfc8: am 231e2474: Merge commit \'c3069c26\' into manualmerge

* commit '7b2fba2f4a78fb42f42268fb899884b8fe4c5e1d':
  Doc change: updates to location landing.

11 years agoam 0f5d1391: am b7059861: am 2694897a: am 787cbb37: am 9a51dfd4: Merge "Doc change...
Dirk Dougherty [Wed, 15 May 2013 14:37:59 +0000 (07:37 -0700)]
am 0f5d1391: am b7059861: am 2694897a: am 787cbb37: am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs

* commit '0f5d1391f511380382b2cb91cf356d80854230b5':
  Doc change: add redirects for edu urls.

11 years agoam 997d0042: am aa0acfc8: am 231e2474: Merge commit \'c3069c26\' into manualmerge
Dirk Dougherty [Wed, 15 May 2013 14:37:55 +0000 (07:37 -0700)]
am 997d0042: am aa0acfc8: am 231e2474: Merge commit \'c3069c26\' into manualmerge

* commit '997d00428c420ba8c2175c7c2e28f14d54abd0b9':
  Doc change: updates to location landing.

11 years agoam b7059861: am 2694897a: am 787cbb37: am 9a51dfd4: Merge "Doc change: add redirects...
Dirk Dougherty [Wed, 15 May 2013 14:35:52 +0000 (07:35 -0700)]
am b7059861: am 2694897a: am 787cbb37: am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs

* commit 'b705986179b1bbda80c9281477a4d6b6b6d27e88':
  Doc change: add redirects for edu urls.

11 years agoam aa0acfc8: am 231e2474: Merge commit \'c3069c26\' into manualmerge
Dirk Dougherty [Wed, 15 May 2013 14:35:49 +0000 (07:35 -0700)]
am aa0acfc8: am 231e2474: Merge commit \'c3069c26\' into manualmerge

* commit 'aa0acfc8761fc8802879f90511b904061a523ed2':
  Doc change: updates to location landing.

11 years agoam 2694897a: am 787cbb37: am 9a51dfd4: Merge "Doc change: add redirects for edu urls...
Dirk Dougherty [Wed, 15 May 2013 14:33:18 +0000 (07:33 -0700)]
am 2694897a: am 787cbb37: am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs

* commit '2694897a3c20b79e3b28601ee43bcaefec827232':
  Doc change: add redirects for edu urls.

11 years agoam 231e2474: Merge commit \'c3069c26\' into manualmerge
Dirk Dougherty [Wed, 15 May 2013 14:33:16 +0000 (07:33 -0700)]
am 231e2474: Merge commit \'c3069c26\' into manualmerge

* commit '231e2474f283dc0a1962b45f1c16c5280a8937df':
  Doc change: updates to location landing.

11 years agoam 787cbb37: am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb...
Dirk Dougherty [Wed, 15 May 2013 14:32:03 +0000 (07:32 -0700)]
am 787cbb37: am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs

* commit '787cbb37d5cb2334af80d8da1b8fa4286e845eee':
  Doc change: add redirects for edu urls.

11 years agoMerge commit 'c3069c26' into manualmerge
Dirk Dougherty [Wed, 15 May 2013 14:30:11 +0000 (07:30 -0700)]
Merge commit 'c3069c26' into manualmerge

Conflicts:
docs/html/guide/topics/location/strategies.jd

Change-Id: If38621ee5e6266fb3a68aff710553dc68d07eb5b

11 years agoam 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs
Dirk Dougherty [Wed, 15 May 2013 13:38:32 +0000 (06:38 -0700)]
am 9a51dfd4: Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs

* commit '9a51dfd4e3e10411ede67743f85cdd510ba3eb90':
  Doc change: add redirects for edu urls.

11 years agoam 8d595130: Merge "Doc change: updates to location landing." into jb-mr1.1-docs
Dirk Dougherty [Wed, 15 May 2013 13:35:10 +0000 (06:35 -0700)]
am 8d595130: Merge "Doc change: updates to location landing." into jb-mr1.1-docs

* commit '8d59513030cbc61c37aec2d2a2343a9bfc03ae2d':
  Doc change: updates to location landing.

11 years agoMerge "Doc change: add redirects for edu urls." into jb-mr1.1-docs
Dirk Dougherty [Wed, 15 May 2013 13:34:31 +0000 (13:34 +0000)]
Merge "Doc change: add redirects for edu urls." into jb-mr1.1-docs

11 years agoMerge "Doc change: updates to location landing." into jb-mr1.1-docs
Dirk Dougherty [Wed, 15 May 2013 13:33:06 +0000 (13:33 +0000)]
Merge "Doc change: updates to location landing." into jb-mr1.1-docs

11 years agoDoc change: updates to location landing.
Dirk Dougherty [Wed, 15 May 2013 06:25:49 +0000 (23:25 -0700)]
Doc change: updates to location landing.

Change-Id: Id7862fd966d9e80bf23521620e964813ad9065a6

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Wed, 15 May 2013 12:55:29 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoam 0163a180: am 8f13a2ad: am c3727b78: am 260f110f: am 7929aafe: am 6402d93e: Doc...
Dirk Dougherty [Wed, 15 May 2013 12:37:14 +0000 (05:37 -0700)]
am 0163a180: am 8f13a2ad: am c3727b78: am 260f110f: am 7929aafe: am 6402d93e: Doc change: add files for edu content.

* commit '0163a180510128142ed9f13bf0d5a7daa4bf6c30':
  Doc change: add files for edu content.

11 years agoam 8f13a2ad: am c3727b78: am 260f110f: am 7929aafe: am 6402d93e: Doc change: add...
Dirk Dougherty [Wed, 15 May 2013 12:35:25 +0000 (05:35 -0700)]
am 8f13a2ad: am c3727b78: am 260f110f: am 7929aafe: am 6402d93e: Doc change: add files for edu content.

* commit '8f13a2ad9f68ddb10388e86104868311e5ee2e29':
  Doc change: add files for edu content.

11 years agoam c3727b78: am 260f110f: am 7929aafe: am 6402d93e: Doc change: add files for edu...
Dirk Dougherty [Wed, 15 May 2013 12:28:14 +0000 (05:28 -0700)]
am c3727b78: am 260f110f: am 7929aafe: am 6402d93e: Doc change: add files for edu content.

* commit 'c3727b78faf23f84a4888d96a0e21716ac0cecb7':
  Doc change: add files for edu content.

11 years agoam 260f110f: am 7929aafe: am 6402d93e: Doc change: add files for edu content.
Dirk Dougherty [Wed, 15 May 2013 11:33:00 +0000 (04:33 -0700)]
am 260f110f: am 7929aafe: am 6402d93e: Doc change: add files for edu content.

* commit '260f110fce5374fa2c4b2d1788a54b1fa5a04d0f':
  Doc change: add files for edu content.

11 years agoam 7929aafe: am 6402d93e: Doc change: add files for edu content.
Dirk Dougherty [Wed, 15 May 2013 11:29:16 +0000 (04:29 -0700)]
am 7929aafe: am 6402d93e: Doc change: add files for edu content.

* commit '7929aafeaf95b1531e471cfbe9b79acd6a783a23':
  Doc change: add files for edu content.

11 years agoDoc change: add redirects for edu urls.
Dirk Dougherty [Wed, 15 May 2013 11:28:25 +0000 (04:28 -0700)]
Doc change: add redirects for edu urls.

Change-Id: Ic46047c99fe9b1902694d9ecdcea1c9c799ee611

11 years agoam 6402d93e: Doc change: add files for edu content.
Dirk Dougherty [Wed, 15 May 2013 11:24:49 +0000 (04:24 -0700)]
am 6402d93e: Doc change: add files for edu content.

* commit '6402d93ed8ff6712c0b9787188607e5a9b212602':
  Doc change: add files for edu content.

11 years agoDoc change: add files for edu content.
Dirk Dougherty [Tue, 7 May 2013 00:27:04 +0000 (17:27 -0700)]
Doc change: add files for edu content.

Change-Id: I5187958d5bbbdd1117df5bcc9b553c06323fef8d

11 years agoam e7ba7a29: am 6999e89f: am 63c15be8: am f76a9d23: am 7ea00d91: am a38ca33d: Doc...
Dirk Dougherty [Wed, 15 May 2013 09:57:23 +0000 (02:57 -0700)]
am e7ba7a29: am 6999e89f: am 63c15be8: am f76a9d23: am 7ea00d91: am a38ca33d: Doc change: update gms and gcm reference TOC.

* commit 'e7ba7a29e81388f9293a90a730a4e9be84938f8b':
  Doc change: update gms and gcm reference TOC.