git.osdn.net Git - android-x86/frameworks-base.git/log

am 4c4160a0: am b0a6241b: am 58d4906b: am 663d7753: am 6aa6219a: Merge "NDK r9d: Incorporates all review comments, final file sizes." into klp-ub-dev

* commit '4c4160a041643072f0bcfbdcfbcc904796dd0a5c':
NDK r9d: Incorporates all review comments, final file sizes.

commit | commitdiff | tree

David Friedman [Tue, 4 Mar 2014 08:22:26 +0000 (08:22 +0000)]

am 1a85d0f7: am a4bd2cbe: am 10226c2a: am c702fa97: am 9182e5f8: DO NOT MERGE

* commit '1a85d0f77065335fa7845032a0ed8b4aee8bc2c1':
DO NOT MERGE

commit | commitdiff | tree

David Friedman [Tue, 4 Mar 2014 08:22:23 +0000 (08:22 +0000)]

am b0a6241b: am 58d4906b: am 663d7753: am 6aa6219a: Merge "NDK r9d: Incorporates all review comments, final file sizes." into klp-ub-dev

* commit 'b0a6241b4dad09e9ec34733102f0ce22afd7ff1b':
NDK r9d: Incorporates all review comments, final file sizes.

commit | commitdiff | tree

Yorke Lee [Tue, 4 Mar 2014 08:21:22 +0000 (08:21 +0000)]

am 06f385c3: am 440e9725: am d53f7a71: am 6c758e86: am 468e973f: am 81479358: Reword the "Quick contacts not available" string

* commit '06f385c3ce7fcb8bd1fc213d464c90b33faaa63f':
Reword the "Quick contacts not available" string

commit | commitdiff | tree

David Friedman [Tue, 4 Mar 2014 08:18:54 +0000 (08:18 +0000)]

am a4bd2cbe: am 10226c2a: am c702fa97: am 9182e5f8: DO NOT MERGE

* commit 'a4bd2cbe509911729c9f185b045e54d7528d8836':
DO NOT MERGE

commit | commitdiff | tree

David Friedman [Tue, 4 Mar 2014 08:18:51 +0000 (08:18 +0000)]

am 58d4906b: am 663d7753: am 6aa6219a: Merge "NDK r9d: Incorporates all review comments, final file sizes." into klp-ub-dev

* commit '58d4906bbf9095c375bffa65d4249eba60cd49b4':
NDK r9d: Incorporates all review comments, final file sizes.

commit | commitdiff | tree

Yorke Lee [Tue, 4 Mar 2014 08:17:17 +0000 (08:17 +0000)]

am 440e9725: am d53f7a71: am 6c758e86: am 468e973f: am 81479358: Reword the "Quick contacts not available" string

* commit '440e97255710bc4bba4b99626f88787069da9269':
Reword the "Quick contacts not available" string

commit | commitdiff | tree

David Friedman [Tue, 4 Mar 2014 08:15:35 +0000 (08:15 +0000)]

am 10226c2a: am c702fa97: am 9182e5f8: DO NOT MERGE

* commit '10226c2af4a09bf8e9ec2a6be661e3c8e6d1f00a':
DO NOT MERGE

commit | commitdiff | tree

David Friedman [Tue, 4 Mar 2014 08:15:29 +0000 (08:15 +0000)]

am 663d7753: am 6aa6219a: Merge "NDK r9d: Incorporates all review comments, final file sizes." into klp-ub-dev

* commit '663d7753eab2298af324db9f42f0ecab06137d04':
NDK r9d: Incorporates all review comments, final file sizes.

commit | commitdiff | tree

Yorke Lee [Tue, 4 Mar 2014 08:14:49 +0000 (08:14 +0000)]

am d53f7a71: am 6c758e86: am 468e973f: am 81479358: Reword the "Quick contacts not available" string

* commit 'd53f7a712d7a5fccd64cd12d3b2bf61883ae2a52':
Reword the "Quick contacts not available" string

commit | commitdiff | tree

David Friedman [Tue, 4 Mar 2014 08:13:10 +0000 (08:13 +0000)]

am c702fa97: am 9182e5f8: DO NOT MERGE

* commit 'c702fa9716b7432234782cae3a8d4c5f2896974d':
DO NOT MERGE

commit | commitdiff | tree

David Friedman [Tue, 4 Mar 2014 08:13:06 +0000 (08:13 +0000)]

am 6aa6219a: Merge "NDK r9d: Incorporates all review comments, final file sizes." into klp-ub-dev

* commit '6aa6219aebc2a73c63e2f0e5f82d3dc55f0a6f9f':
NDK r9d: Incorporates all review comments, final file sizes.

commit | commitdiff | tree

Yorke Lee [Tue, 4 Mar 2014 08:09:42 +0000 (08:09 +0000)]

am 6c758e86: am 468e973f: am 81479358: Reword the "Quick contacts not available" string

* commit '6c758e8650a010b2ad4650df77f91fad5fcf51e2':
Reword the "Quick contacts not available" string

commit | commitdiff | tree

David Friedman [Tue, 4 Mar 2014 07:47:46 +0000 (07:47 +0000)]

am 9182e5f8: DO NOT MERGE

* commit '9182e5f848a2865a233ed143d56ad8dae599d875':
DO NOT MERGE

commit | commitdiff | tree

David Friedman [Wed, 19 Feb 2014 06:08:05 +0000 (22:08 -0800)]

DO NOT MERGE

Moving change to release branch

NDK r9d: Incorporates all review comments, final file sizes.

Staged at: http://boku.mtv:8195/tools/sdk/ndk/index.html

Change-Id: Ie33eed770c029af8a20385b5bd6c05fdc9bea750
(cherry picked from commit 0cdefe09695651e4a56dd980219710af8e1039a3)

commit | commitdiff | tree

David Friedman [Tue, 4 Mar 2014 04:25:38 +0000 (04:25 +0000)]

Merge "NDK r9d: Incorporates all review comments, final file sizes." into klp-ub-dev

commit | commitdiff | tree

Yorke Lee [Tue, 4 Mar 2014 04:12:06 +0000 (04:12 +0000)]

am 468e973f: am 81479358: Reword the "Quick contacts not available" string

* commit '468e973f52d09a5e724c9ccb545ec08c49991506':
Reword the "Quick contacts not available" string

commit | commitdiff | tree

Yorke Lee [Tue, 4 Mar 2014 04:09:04 +0000 (04:09 +0000)]

am 81479358: Reword the "Quick contacts not available" string

* commit '81479358decb0a2cefbb8245e0f56ed0e966d697':
Reword the "Quick contacts not available" string

commit | commitdiff | tree

Scott Main [Tue, 4 Mar 2014 03:24:50 +0000 (03:24 +0000)]

am 4cd08e44: am 031020a7: am b8881542: am 1f8bd433: am 2970654a: am 0109047d: update google play badge AI files, v2.

* commit '4cd08e4445afae142e656ccd5bc6d4fa9bbf816e':
update google play badge AI files, v2.

commit | commitdiff | tree

Scott Main [Tue, 4 Mar 2014 03:21:44 +0000 (03:21 +0000)]

am 031020a7: am b8881542: am 1f8bd433: am 2970654a: am 0109047d: update google play badge AI files, v2.

* commit '031020a7bf133ac2a102cff1dfab060b7e5dc79a':
update google play badge AI files, v2.

commit | commitdiff | tree

Scott Main [Tue, 4 Mar 2014 03:17:58 +0000 (03:17 +0000)]

am b8881542: am 1f8bd433: am 2970654a: am 0109047d: update google play badge AI files, v2.

* commit 'b8881542c4e49c1d38eede36a018690a322c6b63':
update google play badge AI files, v2.

commit | commitdiff | tree

Scott Main [Tue, 4 Mar 2014 03:14:43 +0000 (03:14 +0000)]

am 1f8bd433: am 2970654a: am 0109047d: update google play badge AI files, v2.

* commit '1f8bd43378c98c2cc7dd34b14e2028145f9c3bff':
update google play badge AI files, v2.

commit | commitdiff | tree

Scott Main [Tue, 4 Mar 2014 03:11:40 +0000 (03:11 +0000)]

am 2970654a: am 0109047d: update google play badge AI files, v2.

* commit '2970654a6ad2ebcfaabcb58d120b28987111602a':
update google play badge AI files, v2.

commit | commitdiff | tree

Scott Main [Tue, 4 Mar 2014 03:08:18 +0000 (03:08 +0000)]

am 0109047d: update google play badge AI files, v2.

* commit '0109047de1d68f7e911ae8d39f70330f5dbcd642':
update google play badge AI files, v2.

commit | commitdiff | tree

Scott Main [Wed, 26 Feb 2014 19:54:44 +0000 (11:54 -0800)]

update google play badge AI files, v2.

Change-Id: If74ae8cace0e82e81deede459b7bbf862a266ce7

commit | commitdiff | tree

Scott Main [Tue, 4 Mar 2014 03:04:07 +0000 (03:04 +0000)]

am 653bd16a: am b6efa7a3: am 290fec2e: am b436b93d: am 318c73a0: am 4a5a2392: Merge "dashboard update for march \'14" into klp-docs

* commit '653bd16a0caad1e096ce981985f0617f49742a07':
dashboard update for march '14

commit | commitdiff | tree

Scott Main [Tue, 4 Mar 2014 03:00:58 +0000 (03:00 +0000)]

am b6efa7a3: am 290fec2e: am b436b93d: am 318c73a0: am 4a5a2392: Merge "dashboard update for march \'14" into klp-docs

* commit 'b6efa7a3fa2e517e00a8977e159bd712e3bd534b':
dashboard update for march '14

commit | commitdiff | tree

Scott Main [Tue, 4 Mar 2014 02:57:43 +0000 (02:57 +0000)]

am 290fec2e: am b436b93d: am 318c73a0: am 4a5a2392: Merge "dashboard update for march \'14" into klp-docs

* commit '290fec2e2e4a588d6b2fc48ec4aa25ebf83acf31':
dashboard update for march '14

commit | commitdiff | tree

Scott Main [Tue, 4 Mar 2014 02:54:54 +0000 (02:54 +0000)]

am b436b93d: am 318c73a0: am 4a5a2392: Merge "dashboard update for march \'14" into klp-docs

* commit 'b436b93d98c6e7926746a6d641cc3ffa55bab6b6':
dashboard update for march '14

commit | commitdiff | tree

Scott Main [Tue, 4 Mar 2014 02:50:53 +0000 (02:50 +0000)]

am 318c73a0: am 4a5a2392: Merge "dashboard update for march \'14" into klp-docs

* commit '318c73a0df694bb82821bfc4e2cd874bb09b2fab':
dashboard update for march '14

commit | commitdiff | tree

Yorke Lee [Tue, 10 Dec 2013 17:51:40 +0000 (09:51 -0800)]

Reword the "Quick contacts not available" string

Bug: 12077052
Change-Id: I6006692ae13d79d3697242d0b9015b30b1826eab
(cherry picked from commit 89b366fa95f625275f1b94d800d22998f942ab8c)

commit | commitdiff | tree

Scott Main [Tue, 4 Mar 2014 02:47:51 +0000 (02:47 +0000)]

am 4a5a2392: Merge "dashboard update for march \'14" into klp-docs

* commit '4a5a23920e1a3414f1c87e3cf4c9bce08fddac4f':
dashboard update for march '14

commit | commitdiff | tree

Scott Main [Tue, 4 Mar 2014 02:45:25 +0000 (02:45 +0000)]

Merge "dashboard update for march '14" into klp-docs

commit | commitdiff | tree

David Friedman [Wed, 19 Feb 2014 06:08:05 +0000 (22:08 -0800)]

NDK r9d: Incorporates all review comments, final file sizes.

Staged at: http://boku.mtv:8195/tools/sdk/ndk/index.html

Change-Id: Ie33eed770c029af8a20385b5bd6c05fdc9bea750

commit | commitdiff | tree

Filip Gruszczyński [Tue, 4 Mar 2014 02:08:07 +0000 (02:08 +0000)]

am 177d6bf5: am cad87695: am fad83743: Merge "NumberPicker style for wearable devices." into klp-modular-dev

* commit '177d6bf5866d9391b067ebc62673a942170a47d6':
NumberPicker style for wearable devices.

commit | commitdiff | tree

Filip Gruszczyński [Tue, 4 Mar 2014 02:04:26 +0000 (02:04 +0000)]

am cad87695: am fad83743: Merge "NumberPicker style for wearable devices." into klp-modular-dev

* commit 'cad876957d38f78daa0878a36b04ee4bce858d10':
NumberPicker style for wearable devices.

commit | commitdiff | tree

Svetoslav [Tue, 4 Mar 2014 02:00:06 +0000 (02:00 +0000)]

Merge "NPE in AccessibilityNodeInfoCahce."

commit | commitdiff | tree

Svetoslav [Tue, 4 Mar 2014 01:53:51 +0000 (17:53 -0800)]

NPE in AccessibilityNodeInfoCahce.

Change-Id: I2401e40842ef4ae47bba0a30a5e2589c11e488bc

commit | commitdiff | tree

Filip Gruszczyński [Tue, 4 Mar 2014 01:58:52 +0000 (01:58 +0000)]

am fad83743: Merge "NumberPicker style for wearable devices." into klp-modular-dev

* commit 'fad8374373dcf8d1bb6f3e919a5da14282eb2cd8':
NumberPicker style for wearable devices.

commit | commitdiff | tree

Filip Gruszczyński [Tue, 4 Mar 2014 01:56:37 +0000 (01:56 +0000)]

Merge "NumberPicker style for wearable devices." into klp-modular-dev

commit | commitdiff | tree

Svetoslav [Tue, 4 Mar 2014 01:51:57 +0000 (01:51 +0000)]

Merge "Reverting changes to the accessibility layer."

commit | commitdiff | tree

Tom O'Neill [Tue, 4 Mar 2014 01:48:35 +0000 (17:48 -0800)]

Removing a test provider clears its enabled state

- Bug: 11446702

Change-Id: I56ad9235a99772079193553c0f28bd8d74b3d8e3

commit | commitdiff | tree

Alan Viverette [Tue, 4 Mar 2014 01:45:13 +0000 (01:45 +0000)]

Merge "Quantum for seek bars, spinners, switches"

commit | commitdiff | tree

Svetoslav [Tue, 4 Mar 2014 01:42:11 +0000 (17:42 -0800)]

Reverting changes to the accessibility layer.

1. Views not important for accessibility should still fire accessibility
   events as some accessibility service may be registered to introspect
   all views.

2. Reverting a correct fix from AccessibilityNodeInfoCache to port it in
   a separate change for cherry-pick.

Change-Id: If768259597ed1c884952209dad948c46dff14878

commit | commitdiff | tree

Alan Viverette [Tue, 4 Mar 2014 01:40:46 +0000 (17:40 -0800)]

Quantum for seek bars, spinners, switches

Fixes a bug in Switch that ignores the switch intrinsic height. Reverts
list selectors since they're not implemented in AbsListView yet. Also
adds Quantum for some miscellaneous widgets and icons.

Change-Id: I918bb0165b84e108cdf17a29eadc8424ac35f9ee

commit | commitdiff | tree

Ricardo Cervera [Tue, 4 Mar 2014 01:30:53 +0000 (01:30 +0000)]

am bd443abc: am 07993d1d: am 13a14ac4: am a61e74e1: am 7e4db882: am 240b38aa: Merge "docs: Changes to release notes for the Android SDK 22.6.0 release." into klp-docs

* commit 'bd443abc0d6b90cff54c89454e19f86889455edd':
docs: Changes to release notes for the Android SDK 22.6.0 release.

commit | commitdiff | tree

Ricardo Cervera [Tue, 4 Mar 2014 01:27:37 +0000 (01:27 +0000)]

am 07993d1d: am 13a14ac4: am a61e74e1: am 7e4db882: am 240b38aa: Merge "docs: Changes to release notes for the Android SDK 22.6.0 release." into klp-docs

* commit '07993d1d80692b80c263c3a7b743ce58ce7dd9b5':
docs: Changes to release notes for the Android SDK 22.6.0 release.

commit | commitdiff | tree

Ricardo Cervera [Tue, 4 Mar 2014 01:22:55 +0000 (01:22 +0000)]

am 13a14ac4: am a61e74e1: am 7e4db882: am 240b38aa: Merge "docs: Changes to release notes for the Android SDK 22.6.0 release." into klp-docs

* commit '13a14ac43b8184b082d5107d1e746fe4e16ce563':
docs: Changes to release notes for the Android SDK 22.6.0 release.

commit | commitdiff | tree

Ricardo Cervera [Tue, 4 Mar 2014 01:17:02 +0000 (01:17 +0000)]

am a61e74e1: am 7e4db882: am 240b38aa: Merge "docs: Changes to release notes for the Android SDK 22.6.0 release." into klp-docs

* commit 'a61e74e1646ad1fb702d26be482d613bf991afd8':
docs: Changes to release notes for the Android SDK 22.6.0 release.

commit | commitdiff | tree

Ricardo Cervera [Tue, 4 Mar 2014 01:13:47 +0000 (01:13 +0000)]

am 7e4db882: am 240b38aa: Merge "docs: Changes to release notes for the Android SDK 22.6.0 release." into klp-docs

* commit '7e4db882c55b5f5d46a3b6da1c66f5dd31b601ca':
docs: Changes to release notes for the Android SDK 22.6.0 release.

commit | commitdiff | tree

Ricardo Cervera [Tue, 4 Mar 2014 01:10:51 +0000 (01:10 +0000)]

am 240b38aa: Merge "docs: Changes to release notes for the Android SDK 22.6.0 release." into klp-docs

* commit '240b38aafb05407a147fceefed13df33c19aa2b2':
docs: Changes to release notes for the Android SDK 22.6.0 release.

commit | commitdiff | tree

Ricardo Cervera [Tue, 4 Mar 2014 01:07:52 +0000 (01:07 +0000)]

Merge "docs: Changes to release notes for the Android SDK 22.6.0 release." into klp-docs

commit | commitdiff | tree

Filip Gruszczyński [Mon, 3 Mar 2014 17:09:51 +0000 (09:09 -0800)]

NumberPicker style for wearable devices.

Change-Id: Ib9194fdd951f4486aa833c080d8f7ab661d34a48

commit | commitdiff | tree

Xia Wang [Tue, 4 Mar 2014 00:51:37 +0000 (00:51 +0000)]

Merge "Add timer to wait for screen off"

commit | commitdiff | tree

Ricardo Cervera [Tue, 25 Feb 2014 20:01:27 +0000 (12:01 -0800)]

docs: Changes to release notes for the Android SDK 22.6.0 release.

Updated relese notes for 22.6.0:

Stage:
http://quixote.mtv.corp.google.com:8001/sdk/index.html
http://quixote.mtv.corp.google.com:8001/sdk/installing/installing-adt.html
http://quixote.mtv.corp.google.com:8001/tools/sdk/eclipse-adt.html
http://quixote.mtv.corp.google.com:8001/tools/sdk/tools-notes.html
http://quixote.mtv.corp.google.com:8001/tools/revisions/build-tools.html

(Patch: Cleared md5 and ZIP entries. To be updated with values for
the final build when available.)
(Patch: Added emulator bugfixes from Xav.)
(Patch: Addressed Joe's comments. Added filenames and checksums for the
rc7 build)
(Patch: Replaced sizes and hashes with values for rc8)
(Patch: Added lint categories, addressed Joe's comments)
(Patch: Added note on the lint issue)
(Patch: Addressed Joe's comments, reverted adt-bundle-* to 20131030 files.)

Change-Id: I508d47959c4f478a3ed6b927fd460139cd5cfe36

commit | commitdiff | tree

Jeff Brown [Tue, 4 Mar 2014 00:05:24 +0000 (00:05 +0000)]

Merge "Detect invalid uses of Message."

commit | commitdiff | tree

Victoria Lease [Tue, 4 Mar 2014 00:04:22 +0000 (00:04 +0000)]

am 533d300f: am 268088ee: am 3ce2b57d: am 9404752d: Merge "Add casual/cursive/sans-serif-smallcaps font families."

* commit '533d300f9a4ac98661affe1deb9dca72306ada2b':
Add casual/cursive/sans-serif-smallcaps font families.

commit | commitdiff | tree

Yuhao Zheng [Mon, 3 Mar 2014 23:47:06 +0000 (15:47 -0800)]

Allow more proxy bypass patterns

The current restriction on proxy bypass pattern is harsh. For instance,
"*google.com" is allowed, but "*.google.com" is not. We loosen the validity
check to allow patterns like "*.cnn.com", "*.google*.com", "10.20.*.*".

bug: 13287210
Change-Id: I7551150f785cd087c963f3a8f4c9d05f0002ff04

commit | commitdiff | tree

Victoria Lease [Mon, 3 Mar 2014 23:58:39 +0000 (23:58 +0000)]

am 268088ee: am 3ce2b57d: am 9404752d: Merge "Add casual/cursive/sans-serif-smallcaps font families."

* commit '268088eed6b1dd3153b89de1b4c97c518018e879':
Add casual/cursive/sans-serif-smallcaps font families.

commit | commitdiff | tree

Victoria Lease [Mon, 3 Mar 2014 23:46:21 +0000 (23:46 +0000)]

am 3ce2b57d: am 9404752d: Merge "Add casual/cursive/sans-serif-smallcaps font families."

* commit '3ce2b57d15d4afe330b728c3175b8bfb89c6890a':
Add casual/cursive/sans-serif-smallcaps font families.

commit | commitdiff | tree

Victoria Lease [Mon, 3 Mar 2014 23:44:13 +0000 (15:44 -0800)]

am 9404752d: Merge "Add casual/cursive/sans-serif-smallcaps font families."

* commit '9404752d50a60319f0d2f53c212fad7c7cd8fb8e':
Add casual/cursive/sans-serif-smallcaps font families.

commit | commitdiff | tree

Xia Wang [Mon, 3 Mar 2014 23:14:08 +0000 (15:14 -0800)]

Add timer to wait for screen off

bug#: 13278052

Change-Id: Ic4dc847f3f3fe86750343ffabedb13dbeb4f61a7

commit | commitdiff | tree

Victoria Lease [Mon, 3 Mar 2014 23:38:53 +0000 (23:38 +0000)]

Merge "Add casual/cursive/sans-serif-smallcaps font families."

commit | commitdiff | tree

Jeff Brown [Fri, 28 Feb 2014 22:00:57 +0000 (14:00 -0800)]

Detect invalid uses of Message.

Throw an exception when an application attempts to recycle or
resend messages that are still in-use.

Change-Id: I7096e8b7bd5bec41b7b8ef0c798c55ce3db6827e

commit | commitdiff | tree

Dirk Dougherty [Mon, 3 Mar 2014 23:22:03 +0000 (23:22 +0000)]

am bc8301df: am 0054ed81: am 8bb3b8f8: am 95cf532f: am 26de0b71: am cce121fb: Merge "Update permission description string." into klp-docs

* commit 'bc8301dfa3fc2789c4bf8dc82784075980b6329f':
Update permission description string.

commit | commitdiff | tree

Jay Shrauner [Mon, 3 Mar 2014 23:16:02 +0000 (23:16 +0000)]

am 75b26ccc: (-s ours) am 1fdcab95: am 81f74c7d: am 7e3efa82: am 1f168fd4: am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev

* commit '75b26ccc7d16bb5e4bbe0ad01dfb24b88863dda0':
Catch ActivityNotFoundException in quick contacts badge

commit | commitdiff | tree

Alan Viverette [Mon, 3 Mar 2014 22:41:15 +0000 (22:41 +0000)]

Merge "Quantum for text fields, buttons, radio buttons and check boxes"

commit | commitdiff | tree

Alan Viverette [Mon, 3 Mar 2014 22:40:31 +0000 (14:40 -0800)]

Quantum for text fields, buttons, radio buttons and check boxes

Change-Id: Ie3d034a65553f4f7a66ab078965d3802726c8332

commit | commitdiff | tree

Dirk Dougherty [Mon, 3 Mar 2014 22:30:27 +0000 (22:30 +0000)]

am 0054ed81: am 8bb3b8f8: am 95cf532f: am 26de0b71: am cce121fb: Merge "Update permission description string." into klp-docs

* commit '0054ed815a3db340a27d8a179d3b748bf3eeaaf0':
Update permission description string.

commit | commitdiff | tree

Dirk Dougherty [Mon, 3 Mar 2014 22:24:14 +0000 (22:24 +0000)]

am 8bb3b8f8: am 95cf532f: am 26de0b71: am cce121fb: Merge "Update permission description string." into klp-docs

* commit '8bb3b8f805658ecf9106778992dceea9a05dcc4c':
Update permission description string.

commit | commitdiff | tree

Dirk Dougherty [Mon, 3 Mar 2014 22:21:00 +0000 (22:21 +0000)]

am 95cf532f: am 26de0b71: am cce121fb: Merge "Update permission description string." into klp-docs

* commit '95cf532fe389713ff1fb33810012586fd460e223':
Update permission description string.

commit | commitdiff | tree

Jay Shrauner [Mon, 3 Mar 2014 22:19:37 +0000 (22:19 +0000)]

am 1fdcab95: am 81f74c7d: am 7e3efa82: am 1f168fd4: am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev

* commit '1fdcab956d55418febbbc0f5928242c3420bd16a':
Catch ActivityNotFoundException in quick contacts badge

commit | commitdiff | tree

Dirk Dougherty [Mon, 3 Mar 2014 22:18:04 +0000 (22:18 +0000)]

am 26de0b71: am cce121fb: Merge "Update permission description string." into klp-docs

* commit '26de0b7118e188bac5a30d9562418fa09be3826a':
Update permission description string.

commit | commitdiff | tree

Jay Shrauner [Mon, 3 Mar 2014 22:16:50 +0000 (22:16 +0000)]

am 81f74c7d: am 7e3efa82: am 1f168fd4: am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev

* commit '81f74c7d427f2942cdccae30329694e9825f5d8f':
Catch ActivityNotFoundException in quick contacts badge

commit | commitdiff | tree

Dirk Dougherty [Mon, 3 Mar 2014 22:13:31 +0000 (22:13 +0000)]

am cce121fb: Merge "Update permission description string." into klp-docs

* commit 'cce121fb7504fbc460b85564735ff5d8a1ed4d55':
Update permission description string.

commit | commitdiff | tree

Chris Craik [Mon, 3 Mar 2014 22:11:43 +0000 (22:11 +0000)]

Merge "Ensure setLayerType pushes Paint changes"

commit | commitdiff | tree

Dirk Dougherty [Mon, 3 Mar 2014 22:10:26 +0000 (22:10 +0000)]

Merge "Update permission description string." into klp-docs

commit | commitdiff | tree

Dirk Dougherty [Mon, 3 Mar 2014 22:05:21 +0000 (14:05 -0800)]

Update permission description string.

Change-Id: I6cd5895d78bff4f6f3fc8090e13a9ddbd83a1978

commit | commitdiff | tree

Jay Shrauner [Mon, 3 Mar 2014 22:05:02 +0000 (22:05 +0000)]

am 7e3efa82: am 1f168fd4: am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev

* commit '7e3efa82ecbb9e3cf50f8f455e573aed3b88d183':
Catch ActivityNotFoundException in quick contacts badge

commit | commitdiff | tree

Jay Shrauner [Mon, 3 Mar 2014 22:02:14 +0000 (22:02 +0000)]

am 1f168fd4: am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev

* commit '1f168fd43895e2a84c037df9f3ea54e36f5d0d16':
Catch ActivityNotFoundException in quick contacts badge

commit | commitdiff | tree

Scott Main [Mon, 3 Mar 2014 20:17:17 +0000 (12:17 -0800)]

dashboard update for march '14

Change-Id: I60d96bba527c7fcbfe05c069ad1abf226e38f50c

commit | commitdiff | tree

Jay Shrauner [Mon, 3 Mar 2014 21:58:47 +0000 (21:58 +0000)]

am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev

* commit '4ef0aabe93877b7f30645b873fbc003651151f2f':
Catch ActivityNotFoundException in quick contacts badge

commit | commitdiff | tree

Jay Shrauner [Mon, 3 Mar 2014 21:56:17 +0000 (21:56 +0000)]

Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev

commit | commitdiff | tree

Chong Zhang [Mon, 3 Mar 2014 21:27:34 +0000 (21:27 +0000)]

Merge "fix MediaCodec release deadlock and resource leak"

commit | commitdiff | tree

Jonathan Dixon [Mon, 3 Mar 2014 21:25:21 +0000 (21:25 +0000)]

am 8553be9b: (-s ours) am 6ab920fb: am 5b741144: am 3c88a685: am 7c01f9f7: am efe1b240: DO NOT MERGE: Fix build after checkThread fix merge to master

* commit '8553be9b67ae5591f615138d704f25d78a3e2747':
DO NOT MERGE: Fix build after checkThread fix merge to master

commit | commitdiff | tree

Bart Sears [Mon, 3 Mar 2014 21:25:19 +0000 (21:25 +0000)]

am 5acee806: (-s ours) am 5a0a37e2: am 73eefce3: am 7f950326: am e31c0529: am 4e1bf732: Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev

* commit '5acee806892d0141cdbbe6946d9332b2dc7922ac':
DO NOT MERGE: Adding freeMemoryForTests static method to WebView.

commit | commitdiff | tree

Jonathan Dixon [Mon, 3 Mar 2014 21:22:22 +0000 (21:22 +0000)]

am 6ab920fb: am 5b741144: am 3c88a685: am 7c01f9f7: am efe1b240: DO NOT MERGE: Fix build after checkThread fix merge to master

* commit '6ab920fb614cb7d33498ec75254df5a7fd271ed3':
DO NOT MERGE: Fix build after checkThread fix merge to master

commit | commitdiff | tree

Bart Sears [Mon, 3 Mar 2014 21:22:19 +0000 (21:22 +0000)]

am 5a0a37e2: am 73eefce3: am 7f950326: am e31c0529: am 4e1bf732: Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev

* commit '5a0a37e23d73befbd7ebf0e8a252a40b0102b72f':
DO NOT MERGE: Adding freeMemoryForTests static method to WebView.

commit | commitdiff | tree

Jonathan Dixon [Mon, 3 Mar 2014 21:16:47 +0000 (21:16 +0000)]

am 5b741144: am 3c88a685: am 7c01f9f7: am efe1b240: DO NOT MERGE: Fix build after checkThread fix merge to master

* commit '5b741144a6feadb5c51fecb0235c605f0b9fb803':
DO NOT MERGE: Fix build after checkThread fix merge to master

commit | commitdiff | tree

Bart Sears [Mon, 3 Mar 2014 21:16:43 +0000 (21:16 +0000)]

am 73eefce3: am 7f950326: am e31c0529: am 4e1bf732: Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev

* commit '73eefce3085a0fbe3ab65e69af319b21b92c7252':
DO NOT MERGE: Adding freeMemoryForTests static method to WebView.

commit | commitdiff | tree

Tom O'Neill [Mon, 3 Mar 2014 21:05:47 +0000 (21:05 +0000)]

Merge "Discourage content observers on LOCATION_PROVIDERS_ALLOWED"

commit | commitdiff | tree

Tom O'Neill [Mon, 3 Mar 2014 21:04:28 +0000 (21:04 +0000)]

Merge "Injected settings no longer include summaries"

commit | commitdiff | tree

Tim Murray [Mon, 3 Mar 2014 20:55:31 +0000 (20:55 +0000)]

am 4db08b04: am 9f141fbb: am fb51a430: am 8377a4fd: Merge "Fix null check for BaseObj.equals."

* commit '4db08b044dfbd01912353f0c85a43973407d98b0':
Fix null check for BaseObj.equals.

commit | commitdiff | tree

Tim Murray [Mon, 3 Mar 2014 20:41:01 +0000 (20:41 +0000)]

am 9f141fbb: am fb51a430: am 8377a4fd: Merge "Fix null check for BaseObj.equals."

* commit '9f141fbb786c07ff56324717e1e0747a3cabf23b':
Fix null check for BaseObj.equals.

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help