Joe Fernandez
98139183f3
am b8122630: am 9167c2d0: am c6cb1b84: am 85cd4ead: Merge "docs: Android SDK/ADT 22.0 Release Notes" into jb-mr1.1-docs
...
* commit 'b8122630b0ed360c4bd653ee52e023c2af005fe4':
docs: Android SDK/ADT 22.0 Release Notes
2013-05-14 18:34:36 -07:00
Kenny Root
92d96fe94f
am f35b35df: am cdc457bb: Merge "Tracking change to add AEAD functionality"
...
* commit 'f35b35df6e5690577a9fbdb8a94903ad65a14a29':
Tracking change to add AEAD functionality
2013-05-14 18:34:08 -07:00
Joe Fernandez
b8122630b0
am 9167c2d0: am c6cb1b84: am 85cd4ead: Merge "docs: Android SDK/ADT 22.0 Release Notes" into jb-mr1.1-docs
...
* commit '9167c2d08c1473555f1338b395a27df66de82c13':
docs: Android SDK/ADT 22.0 Release Notes
2013-05-14 18:33:32 -07:00
Joe Fernandez
9167c2d08c
am c6cb1b84: am 85cd4ead: Merge "docs: Android SDK/ADT 22.0 Release Notes" into jb-mr1.1-docs
...
* commit 'c6cb1b84b59cadeed2fcbc9680c771efc6fce3b1':
docs: Android SDK/ADT 22.0 Release Notes
2013-05-14 18:31:54 -07:00
Kenny Root
f35b35df6e
am cdc457bb: Merge "Tracking change to add AEAD functionality"
...
* commit 'cdc457bbba0afae2f0bc1b1df7ba596da3a48676':
Tracking change to add AEAD functionality
2013-05-14 18:29:22 -07:00
Joe Fernandez
c6cb1b84b5
am 85cd4ead: Merge "docs: Android SDK/ADT 22.0 Release Notes" into jb-mr1.1-docs
...
* commit '85cd4ead84b893bb7e8896ce692845318943a578':
docs: Android SDK/ADT 22.0 Release Notes
2013-05-14 18:29:21 -07:00
Joe Fernandez
85cd4ead84
Merge "docs: Android SDK/ADT 22.0 Release Notes" into jb-mr1.1-docs
2013-05-15 01:27:19 +00:00
Joe Fernandez
82772f1dfe
docs: Android SDK/ADT 22.0 Release Notes
...
SDK 22 Release Notes for Google I/O 2013 release
Change-Id: I56f4db97b8cc1ae178ba0ab4f2391d074a658f0b
2013-05-14 18:23:02 -07:00
Joe Fernandez
cde9a461eb
am 08405ee6: am cb5d59fd: am 278f6ec3: am 9af9a39d: am 95f6c758: Search tag additions
...
* commit '08405ee6adc7b89f7bae76ae9761dd1f2a4c9e95':
Search tag additions
2013-05-14 18:04:24 -07:00
Joe Fernandez
08405ee6ad
am cb5d59fd: am 278f6ec3: am 9af9a39d: am 95f6c758: Search tag additions
...
* commit 'cb5d59fd35f5ee506736e956525c4fd1ed95d684':
Search tag additions
2013-05-14 18:02:12 -07:00
Joe Fernandez
cb5d59fd35
am 278f6ec3: am 9af9a39d: am 95f6c758: Search tag additions
...
* commit '278f6ec3c3611f18a6364df0902a7ff6eb78b690':
Search tag additions
2013-05-14 17:57:49 -07:00
Joe Fernandez
278f6ec3c3
am 9af9a39d: am 95f6c758: Search tag additions
...
* commit '9af9a39d4e49b1d437a591c1d2d276c031beebea':
Search tag additions
2013-05-14 17:56:24 -07:00
Kenny Root
cdc457bbba
Merge "Tracking change to add AEAD functionality"
2013-05-15 00:55:58 +00:00
Joe Fernandez
9af9a39d4e
am 95f6c758: Search tag additions
...
* commit '95f6c758ae176747cf6675e37b984a8aece29dcd':
Search tag additions
2013-05-14 17:54:58 -07:00
Kenny Root
e60bcc63e5
Tracking change to add AEAD functionality
...
This tracks libcore change d416195acbc08f2b3bdd5d5532d40438465d99e9
Change-Id: I4621472e19f6630da8498cc46221b939f11fba66
2013-05-14 17:54:07 -07:00
Christopher Tate
84c6e6b327
am f0571539: am f95fdc97: Merge "Maintain restrictions when downgrading system apps" into jb-mr2-dev
...
* commit 'f0571539801b0cf11ddb37d377343bcc86218bd1':
Maintain restrictions when downgrading system apps
2013-05-14 17:20:12 -07:00
Christopher Tate
f057153980
am f95fdc97: Merge "Maintain restrictions when downgrading system apps" into jb-mr2-dev
...
* commit 'f95fdc9754eea76066905424044b7c6d43c60c2d':
Maintain restrictions when downgrading system apps
2013-05-14 17:18:15 -07:00
Christopher Tate
f95fdc9754
Merge "Maintain restrictions when downgrading system apps" into jb-mr2-dev
2013-05-15 00:14:06 +00:00
Zhentao Sun
da86196287
am 0412f5b1: am 5f8afdd8: Merge "Passed the correct gps geofence availability value to client." into jb-mr2-dev
...
* commit '0412f5b1165d7ff331162dcd1fc29d3ea0fc7223':
Passed the correct gps geofence availability value to client.
2013-05-14 16:55:44 -07:00
Zhentao Sun
0412f5b116
am 5f8afdd8: Merge "Passed the correct gps geofence availability value to client." into jb-mr2-dev
...
* commit '5f8afdd8ec168a7e5e5ca8203419a40f069a9351':
Passed the correct gps geofence availability value to client.
2013-05-14 16:53:42 -07:00
Zhentao Sun
5f8afdd8ec
Merge "Passed the correct gps geofence availability value to client." into jb-mr2-dev
2013-05-14 23:51:16 +00:00
Christopher Tate
acee6e9121
Maintain restrictions when downgrading system apps
...
When an upgraded system-bundled app is reverted to the factory
version, we now maintain restricted profiles' access policies
w.r.t. that app.
Bug 8905395
Change-Id: I3f230ac3f70a77fb14c0180b44c9b42fc49250a2
2013-05-14 16:47:07 -07:00
Matthew Xie
2d704d215f
am b82fc420: am f270fc3b: Merge "cannot turn on bluetooth" into jb-mr2-dev
...
* commit 'b82fc420f38c48a3bf9f379de5126906497f2440':
cannot turn on bluetooth
2013-05-14 16:23:14 -07:00
Matthew Xie
b82fc420f3
am f270fc3b: Merge "cannot turn on bluetooth" into jb-mr2-dev
...
* commit 'f270fc3b5014e39614f7e6499cd6aa4ea18e8616':
cannot turn on bluetooth
2013-05-14 16:21:30 -07:00
Matthew Xie
f270fc3b50
Merge "cannot turn on bluetooth" into jb-mr2-dev
2013-05-14 23:18:04 +00:00
Joe Fernandez
95f6c758ae
Search tag additions
...
Adding more search tags for feature areas (tools, adk, gcm, etc.)
Change-Id: I34b9b6e220b19f6adaf532e39eebb0d30b1573c7
2013-05-14 16:10:58 -07:00
Zhentao Sun
b8061be81c
Passed the correct gps geofence availability value to client.
...
Fixed b/8967427.
Change-Id: If205b963533f096c27985476a5d487a2d090ccf8
2013-05-14 15:34:15 -07:00
Amith Yamasani
ce2b6f9654
Opt-in Settings package to see restricted accounts
...
This can't be done in the settings package because the API only allows one account type
to be listed. This resource gives the Settings app blanket access to restricted accounts
when running in a restricted profile.
Bug: 8968575
Change-Id: I69b42b496d9cf235982d40a142c084295edc6281
2013-05-14 15:10:19 -07:00
Chris Craik
6d29c8d521
Add tessellation path for points
...
bug:4351353
bug:8185479
Point tessellation is similar to line special case, except that we
only tessellate one point (as a circle or rect) and duplicate it
across other instances.
Additionally:
Fixes square caps for AA=false lines
Cleanup in CanvasCompare, disabling interpolation on zoomed-in
comparison view
Change-Id: I0756fcc4b20f77878fed0d8057297c80e82ed9dc
2013-05-14 14:12:55 -07:00
Raph Levien
01524651cb
Fix for bug 8911390 RTL text alignment is changed ...
...
The predicate for detecting whether text was right aligned was missing
some cases - it was correctly sensing RIGHT or OPPOSITE aligned text
in the LTR case, but was missing NORMAL for rtl. This patch just adds
that case.
Change-Id: I06691e7122e1ca91d66299cf0d7ef1f8a476a44b
2013-05-14 14:00:07 -07:00
Glenn Kasten
0ace0aa7d6
am 10d69f55: am 7c6ebac7: am b1199209: am 702543f3: am c0f462c9: am 86593304: am 068e2315: Merge "A/V sync and latency PCB" into jb-mr1.1-docs
...
* commit '10d69f556faf9f572f55cc6166641ecca2ce812c':
A/V sync and latency PCB
2013-05-14 13:00:52 -07:00
Glenn Kasten
10d69f556f
am 7c6ebac7: am b1199209: am 702543f3: am c0f462c9: am 86593304: am 068e2315: Merge "A/V sync and latency PCB" into jb-mr1.1-docs
...
* commit '7c6ebac75dd75382dbc71e8a5ca943d29266af06':
A/V sync and latency PCB
2013-05-14 12:58:18 -07:00
The Android Automerger
540fd9df3b
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-14 12:58:06 -07:00
Glenn Kasten
7c6ebac75d
am b1199209: am 702543f3: am c0f462c9: am 86593304: am 068e2315: Merge "A/V sync and latency PCB" into jb-mr1.1-docs
...
* commit 'b1199209adbdf62d0ba1f48815925c15ed17d120':
A/V sync and latency PCB
2013-05-14 12:56:18 -07:00
Glenn Kasten
b1199209ad
am 702543f3: am c0f462c9: am 86593304: am 068e2315: Merge "A/V sync and latency PCB" into jb-mr1.1-docs
...
* commit '702543f3e1b9e3fdaa379663e8e79d532ad6edd8':
A/V sync and latency PCB
2013-05-14 12:53:49 -07:00
Glenn Kasten
702543f3e1
am c0f462c9: am 86593304: am 068e2315: Merge "A/V sync and latency PCB" into jb-mr1.1-docs
...
* commit 'c0f462c9b5fb5288e78c9a676e8b86525646d522':
A/V sync and latency PCB
2013-05-14 12:51:32 -07:00
Glenn Kasten
c0f462c9b5
am 86593304: am 068e2315: Merge "A/V sync and latency PCB" into jb-mr1.1-docs
...
* commit '86593304c7733fff6308543e2359573435376def':
A/V sync and latency PCB
2013-05-14 12:49:44 -07:00
Glenn Kasten
86593304c7
am 068e2315: Merge "A/V sync and latency PCB" into jb-mr1.1-docs
...
* commit '068e2315ff61d2aadd8ee78b25deeef27084dc64':
A/V sync and latency PCB
2013-05-14 12:48:13 -07:00
Glenn Kasten
068e2315ff
Merge "A/V sync and latency PCB" into jb-mr1.1-docs
2013-05-14 19:45:36 +00:00
Elliott Hughes
112a2b6ca7
am 4d86196f: am b37652a2: Merge "Track libcore API changes."
...
* commit '4d86196ff289084ff062073832fa3ab737ec0061':
Track libcore API changes.
2013-05-14 11:48:23 -07:00
Elliott Hughes
4d86196ff2
am b37652a2: Merge "Track libcore API changes."
...
* commit 'b37652a297fa3795b03823db3edd5d9d30a43259':
Track libcore API changes.
2013-05-14 11:45:38 -07:00
kmccormick
c1475c4565
am 69f8d654: am 15715588: am c9c33d93: am 19721f9e: am 592b822c: am 6e5dc4dd: am 0bf8c6f9: Merge "Doc update: CCS and notifications" into jb-mr1.1-docs
...
* commit '69f8d654cb8579a23049995f8c1266fc235338c5':
Doc update: CCS and notifications
2013-05-14 11:44:43 -07:00
kmccormick
69f8d654cb
am 15715588: am c9c33d93: am 19721f9e: am 592b822c: am 6e5dc4dd: am 0bf8c6f9: Merge "Doc update: CCS and notifications" into jb-mr1.1-docs
...
* commit '157155887c0684170ef0c64179ce94cdfe257972':
Doc update: CCS and notifications
2013-05-14 11:40:50 -07:00
Elliott Hughes
b37652a297
Merge "Track libcore API changes."
2013-05-14 18:38:42 +00:00
Dirk Dougherty
5a02d966e7
am 22f12074: am d01558cb: am 6078beaa: am d322783e: am d9938ed3: am 373fb749: am 70b0728b: Merge "Doc change: Add localization checklist." into jb-mr1.1-docs
...
* commit '22f1207462a5f9c1d0836652892db0b7236cdbfa':
Doc change: Add localization checklist.
2013-05-14 11:37:40 -07:00
Dirk Dougherty
dd7304abba
am 667153fb: am c5478d50: am 8719fd07: am 9d59115b: am 42a039cd: am d1ebc639: am 53559d0b: Merge "Doc change: Clean refresh of gms reference to remove unused." into jb-mr1.1-docs
...
* commit '667153fb7782d5e08bc1c39333759427045c5030':
Doc change: Clean refresh of gms reference to remove unused.
2013-05-14 11:37:37 -07:00
Scott Main
1cd80812c4
am 40af4979: am 8f4b8062: am ad78d575: am 5644deed: am cbcd17d3: add new notice link from design docs to developer docs
...
* commit '40af497913c06e1ec807af88d42c56ae7143e2cb':
add new notice link from design docs to developer docs
2013-05-14 11:37:35 -07:00
kmccormick
157155887c
am c9c33d93: am 19721f9e: am 592b822c: am 6e5dc4dd: am 0bf8c6f9: Merge "Doc update: CCS and notifications" into jb-mr1.1-docs
...
* commit 'c9c33d9373d9781dd21e449493e66de127c2d87a':
Doc update: CCS and notifications
2013-05-14 11:35:59 -07:00
Dirk Dougherty
22f1207462
am d01558cb: am 6078beaa: am d322783e: am d9938ed3: am 373fb749: am 70b0728b: Merge "Doc change: Add localization checklist." into jb-mr1.1-docs
...
* commit 'd01558cb96ff80721ca22510494072f9b5188708':
Doc change: Add localization checklist.
2013-05-14 11:33:54 -07:00
Dirk Dougherty
667153fb77
am c5478d50: am 8719fd07: am 9d59115b: am 42a039cd: am d1ebc639: am 53559d0b: Merge "Doc change: Clean refresh of gms reference to remove unused." into jb-mr1.1-docs
...
* commit 'c5478d504d37058c673f193605b65be7857d69fb':
Doc change: Clean refresh of gms reference to remove unused.
2013-05-14 11:33:51 -07:00