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

Geremy Condra [Fri, 29 Mar 2013 23:39:45 +0000 (16:39 -0700)]

Fix a comment to fix the build.

Change-Id: I9acfef97572bbb0438afbc95df6a718ba506c2c4

Geremy Condra [Wed, 27 Mar 2013 04:09:01 +0000 (21:09 -0700)]

Add SELinux updater and Settings-based enforcement switch.

Bug: 8116902
Change-Id: Ifac495026a354dac7655c28ea2188499a2a319aa

commit | commitdiff | tree

Geremy Condra [Wed, 27 Mar 2013 04:49:26 +0000 (21:49 -0700)]

Add ConfigUpdater settings values to the global table.

This is a partial fix to a bug caused by not properly migrating
these values from secure: to global:

Change-Id: Iaed77b5ab671f9cd229c7883ae09a0b4a5f3c64e

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 22:02:40 +0000 (15:02 -0700)]

am 306a5d0f: am da160ec3: am 6eebd6e6: am 6f50c846: am d2c1e947: am 39f864b1: am 5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs

* commit '306a5d0fe7654653dd97a630ef8eac1fff71d78b':
Doc update: incorrect method name

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 21:58:50 +0000 (14:58 -0700)]

am da160ec3: am 6eebd6e6: am 6f50c846: am d2c1e947: am 39f864b1: am 5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs

* commit 'da160ec313d844b09818a91463631440a1b8a09c':
Doc update: incorrect method name

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 21:51:25 +0000 (14:51 -0700)]

am 6eebd6e6: am 6f50c846: am d2c1e947: am 39f864b1: am 5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs

* commit '6eebd6e6b44d7688489c430cad933e971530e43d':
Doc update: incorrect method name

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 21:48:35 +0000 (14:48 -0700)]

am 6f50c846: am d2c1e947: am 39f864b1: am 5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs

* commit '6f50c846ad46dfeadf8eac389102031662ad892f':
Doc update: incorrect method name

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 21:46:53 +0000 (14:46 -0700)]

am d2c1e947: am 39f864b1: am 5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs

* commit 'd2c1e947ea27ccea8060b0ef4509b3d6c90c4c51':
Doc update: incorrect method name

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 21:44:59 +0000 (14:44 -0700)]

am 39f864b1: am 5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs

* commit '39f864b18153768224f4e1b6a650dfa0a9312055':
Doc update: incorrect method name

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 21:43:35 +0000 (14:43 -0700)]

am 962088fd: am 10d598a2: am ac1807ab: am acf47ca6: am da03abb6: am addfe2be: am d51a557a: Merge "Doc update: obsolete ant target." into jb-mr1.1-docs

* commit '962088fd4985c82c189432a36cef1ffd7df4f65c':
Doc update: obsolete ant target.

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 21:42:44 +0000 (14:42 -0700)]

am 5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs

* commit '5018688b69129a6d1c58167329df1b06dba23095':
Doc update: incorrect method name

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 21:40:57 +0000 (14:40 -0700)]

am 10d598a2: am ac1807ab: am acf47ca6: am da03abb6: am addfe2be: am d51a557a: Merge "Doc update: obsolete ant target." into jb-mr1.1-docs

* commit '10d598a2bd1ed7d2a46c06ec5acfab233003634b':
Doc update: obsolete ant target.

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 21:38:49 +0000 (21:38 +0000)]

Merge "Doc update: incorrect method name" into jb-mr1.1-docs

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 21:38:19 +0000 (14:38 -0700)]

am ac1807ab: am acf47ca6: am da03abb6: am addfe2be: am d51a557a: Merge "Doc update: obsolete ant target." into jb-mr1.1-docs

* commit 'ac1807ab1d90a531550ee07356c52fe05abae32d':
Doc update: obsolete ant target.

commit | commitdiff | tree

Kenny Root [Fri, 29 Mar 2013 21:36:33 +0000 (14:36 -0700)]

am 9759a476: am b3817722: Merge "KeyStore: add API to query storage type" into jb-mr2-dev

* commit '9759a47650cfd8624f49eb1f152fd900921f3d6e':
KeyStore: add API to query storage type

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 21:36:24 +0000 (14:36 -0700)]

am cd186198: am 0525c09b: am 138ad7ba: am a80a7164: am 859a4301: am 4e259b2c: am 0e6691be: Merge "Doc update: typos in code snippets." into jb-mr1.1-docs

* commit 'cd18619857c958f9d8120591918cf0eea33c08a3':
Doc update: typos in code snippets.

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 21:36:18 +0000 (14:36 -0700)]

am bea4797d: am da58f7f1: am d80f5809: am 7c805a0e: am 404eb8d3: am a243e162: am 82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs

* commit 'bea4797dd2451047dac857f849aa22d0588853ad':
Doc update: emulator bug fix

commit | commitdiff | tree

Jatin Lodhia [Fri, 29 Mar 2013 21:36:14 +0000 (14:36 -0700)]

am 98c762bf: am ce66fd74: Merge "AccountManager changes for profile seeding." into jb-mr2-dev

* commit '98c762bf7cd291e4ae3d9923a8feb3389855ecff':
AccountManager changes for profile seeding.

commit | commitdiff | tree

Romain Guy [Fri, 29 Mar 2013 21:36:09 +0000 (14:36 -0700)]

am 254f8082: am 77ebbbe0: Merge "Prevent crash when a single layer is enqueued several times for updates Bug #8504687" into jb-mr2-dev

* commit '254f80823f034da878c66eda32c604e0333cc318':
Prevent crash when a single layer is enqueued several times for updates Bug #8504687

commit | commitdiff | tree

Fabrice Di Meglio [Fri, 29 Mar 2013 21:36:00 +0000 (14:36 -0700)]

am 3526196d: am 3dc52ce7: Merge "Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev

* commit '3526196d1f405d6a42c15d3091ca3843c2002422':
Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 21:35:34 +0000 (14:35 -0700)]

am acf47ca6: am da03abb6: am addfe2be: am d51a557a: Merge "Doc update: obsolete ant target." into jb-mr1.1-docs

* commit 'acf47ca6331f6e9576e9970ec8b657e068cc02cb':
Doc update: obsolete ant target.

commit | commitdiff | tree

Irfan Sheriff [Fri, 29 Mar 2013 21:35:14 +0000 (14:35 -0700)]

am 2b2845b0: am 964a6a7e: Merge "Scope certs for wifi UID and handle migration" into jb-mr2-dev

* commit '2b2845b0c130a495e844ec454cb61f9d0f76899e':
Scope certs for wifi UID and handle migration

commit | commitdiff | tree

Raph Levien [Fri, 29 Mar 2013 21:34:49 +0000 (14:34 -0700)]

am 2adf34e3: am 76a40744: Merge "Switch indic fonts to Noto" into jb-mr2-dev

* commit '2adf34e3899ee6f74b053ca5bb0dda291c7f2014':
Switch indic fonts to Noto

commit | commitdiff | tree

Raph Levien [Fri, 29 Mar 2013 21:34:46 +0000 (14:34 -0700)]

am 0a914107: am 8fed6bc8: Merge "Make zero width space a line breaker" into jb-mr2-dev

* commit '0a914107205981a8baa079736c959ea9abedbf50':
Make zero width space a line breaker

commit | commitdiff | tree

Dianne Hackborn [Fri, 29 Mar 2013 21:34:38 +0000 (14:34 -0700)]

am d680287b: am cb5a4bf2: Merge "Apparently SystemUI no longer needs the carousel." into jb-mr2-dev

* commit 'd680287b420dea41280a28d80eac79f780e0f7d0':
Apparently SystemUI no longer needs the carousel.

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 21:31:54 +0000 (14:31 -0700)]

Doc update: incorrect method name

"Bug: 8177983"

Change-Id: Ib8f811a8e82dbff9b4e97cb670dec66342a0df00

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 21:31:24 +0000 (14:31 -0700)]

am da03abb6: am addfe2be: am d51a557a: Merge "Doc update: obsolete ant target." into jb-mr1.1-docs

* commit 'da03abb635009e555fc00783084ce17d548fe08d':
Doc update: obsolete ant target.

commit | commitdiff | tree

Jean-Michel Trivi [Fri, 29 Mar 2013 21:30:34 +0000 (14:30 -0700)]

resolved conflicts for merge of 99bd302c to master

Change-Id: I858f67d0c61f6403b336c82a300f69027fc16bd1

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 21:28:30 +0000 (14:28 -0700)]

am addfe2be: am d51a557a: Merge "Doc update: obsolete ant target." into jb-mr1.1-docs

* commit 'addfe2bef1c84296188bf426e52e01bc62d49b9a':
Doc update: obsolete ant target.

commit | commitdiff | tree

Kenny Root [Fri, 29 Mar 2013 21:28:18 +0000 (14:28 -0700)]

am b3817722: Merge "KeyStore: add API to query storage type" into jb-mr2-dev

* commit 'b381772246e305de3839728d9688190753800462':
KeyStore: add API to query storage type

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 21:25:44 +0000 (14:25 -0700)]

am d51a557a: Merge "Doc update: obsolete ant target." into jb-mr1.1-docs

* commit 'd51a557ab662c868d2d28675234de8eaf1c675e6':
Doc update: obsolete ant target.

commit | commitdiff | tree

Kenny Root [Fri, 29 Mar 2013 21:24:35 +0000 (21:24 +0000)]

Merge "KeyStore: add API to query storage type" into jb-mr2-dev

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 21:23:02 +0000 (21:23 +0000)]

Merge "Doc update: obsolete ant target." into jb-mr1.1-docs

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 21:21:18 +0000 (14:21 -0700)]

am 0525c09b: am 138ad7ba: am a80a7164: am 859a4301: am 4e259b2c: am 0e6691be: Merge "Doc update: typos in code snippets." into jb-mr1.1-docs

* commit '0525c09bc07a7b45a132f13769e830466547d0d9':
Doc update: typos in code snippets.

commit | commitdiff | tree

Kenny Root [Fri, 29 Mar 2013 18:14:17 +0000 (11:14 -0700)]

KeyStore: add API to query storage type

Add an API to keystore daemon to query what kind of storage is currently
in use.

(cherry picked from commit a738e2a1aee26e0be3944c11820724aeca313f83)

Change-Id: I52c84449a27b1cefc49372a6406b7132c2bbddee

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 21:18:12 +0000 (14:18 -0700)]

am 138ad7ba: am a80a7164: am 859a4301: am 4e259b2c: am 0e6691be: Merge "Doc update: typos in code snippets." into jb-mr1.1-docs

* commit '138ad7ba1b59f6105d1f79966e616f5970970ef3':
Doc update: typos in code snippets.

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 21:15:43 +0000 (14:15 -0700)]

am a80a7164: am 859a4301: am 4e259b2c: am 0e6691be: Merge "Doc update: typos in code snippets." into jb-mr1.1-docs

* commit 'a80a71648ac9cb306007e67afbc4bedb4debf899':
Doc update: typos in code snippets.

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 21:14:44 +0000 (14:14 -0700)]

Doc update: obsolete ant target.

"Bug: 8435577"

Change-Id: Iaec80cef09f70ccc5d0421b4d2d9a16ada0bd12d

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 21:12:44 +0000 (14:12 -0700)]

am 859a4301: am 4e259b2c: am 0e6691be: Merge "Doc update: typos in code snippets." into jb-mr1.1-docs

* commit '859a4301d83bf894ffd79e4f3d8abf82ce1143c5':
Doc update: typos in code snippets.

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 21:10:16 +0000 (14:10 -0700)]

am 4e259b2c: am 0e6691be: Merge "Doc update: typos in code snippets." into jb-mr1.1-docs

* commit '4e259b2cde9cc028fbaddcd650934b6d422e0dff':
Doc update: typos in code snippets.

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 21:07:54 +0000 (14:07 -0700)]

am 0e6691be: Merge "Doc update: typos in code snippets." into jb-mr1.1-docs

* commit '0e6691be2abbc11af2d50f1dfdebf3f11285993d':
Doc update: typos in code snippets.

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 21:05:00 +0000 (21:05 +0000)]

Merge "Doc update: typos in code snippets." into jb-mr1.1-docs

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 21:02:54 +0000 (14:02 -0700)]

Doc update: typos in code snippets.

"Bug: 8475026"

Change-Id: If516a2a6c6416f1fb10c0d4f0c94bd5e849e0cc9

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 20:58:57 +0000 (13:58 -0700)]

am da58f7f1: am d80f5809: am 7c805a0e: am 404eb8d3: am a243e162: am 82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs

* commit 'da58f7f1c396c71fa89d58bc2c25e6ed30cb573f':
Doc update: emulator bug fix

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 20:57:22 +0000 (13:57 -0700)]

am d80f5809: am 7c805a0e: am 404eb8d3: am a243e162: am 82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs

* commit 'd80f58095b5b1358c40c9bdf50afceaaa7ce87e5':
Doc update: emulator bug fix

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 20:56:05 +0000 (13:56 -0700)]

am 7c805a0e: am 404eb8d3: am a243e162: am 82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs

* commit '7c805a0e0eb42244438c83678f103c4bb7071a4b':
Doc update: emulator bug fix

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 20:54:15 +0000 (13:54 -0700)]

am 404eb8d3: am a243e162: am 82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs

* commit '404eb8d36a2e6ebea3f16ad1e013423f7f1d4d13':
Doc update: emulator bug fix

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 20:51:07 +0000 (13:51 -0700)]

am a243e162: am 82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs

* commit 'a243e162542cd4dcfc3ffd7b46b111efe402972f':
Doc update: emulator bug fix

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 20:49:31 +0000 (13:49 -0700)]

am 82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs

* commit '82a42a25e3e7dceefdca41096ce6e768f285076c':
Doc update: emulator bug fix

commit | commitdiff | tree

Jatin Lodhia [Fri, 29 Mar 2013 20:47:38 +0000 (13:47 -0700)]

am ce66fd74: Merge "AccountManager changes for profile seeding." into jb-mr2-dev

* commit 'ce66fd747928fd1af119bcdc120bfcfb5add05b1':
AccountManager changes for profile seeding.

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 20:47:11 +0000 (20:47 +0000)]

Merge "Doc update: emulator bug fix" into jb-mr1.1-docs

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 20:44:19 +0000 (13:44 -0700)]

Doc update: emulator bug fix

"Bug: 7990692"

Change-Id: I767c5662cebf7fe8f578190bc9730d72e97abeb1

commit | commitdiff | tree

Jatin Lodhia [Fri, 29 Mar 2013 20:44:49 +0000 (20:44 +0000)]

Merge "AccountManager changes for profile seeding." into jb-mr2-dev

commit | commitdiff | tree

Romain Guy [Fri, 29 Mar 2013 20:32:14 +0000 (13:32 -0700)]

am 77ebbbe0: Merge "Prevent crash when a single layer is enqueued several times for updates Bug #8504687" into jb-mr2-dev

* commit '77ebbbe042dc4d5c162da5e2d3b379ebc8514fc9':
Prevent crash when a single layer is enqueued several times for updates Bug #8504687

commit | commitdiff | tree

Romain Guy [Fri, 29 Mar 2013 20:29:11 +0000 (20:29 +0000)]

Merge "Prevent crash when a single layer is enqueued several times for updates Bug #8504687" into jb-mr2-dev

commit | commitdiff | tree

Fabrice Di Meglio [Fri, 29 Mar 2013 19:42:05 +0000 (12:42 -0700)]

am 3dc52ce7: Merge "Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev

* commit '3dc52ce711a6345d9f18dd31e39344792116597c':
Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode

commit | commitdiff | tree

Fabrice Di Meglio [Fri, 29 Mar 2013 19:38:50 +0000 (19:38 +0000)]

Merge "Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev

commit | commitdiff | tree

Romain Guy [Fri, 29 Mar 2013 19:37:16 +0000 (12:37 -0700)]

Prevent crash when a single layer is enqueued several times for updates
Bug #8504687

Change-Id: I9b01bbc4e3f37af23dfe5e68d3d03ad3d238b94a

commit | commitdiff | tree

Irfan Sheriff [Fri, 29 Mar 2013 17:36:38 +0000 (10:36 -0700)]

am 964a6a7e: Merge "Scope certs for wifi UID and handle migration" into jb-mr2-dev

* commit '964a6a7e209b0db262c827721ae5fde3f98ca763':
Scope certs for wifi UID and handle migration

commit | commitdiff | tree

Irfan Sheriff [Fri, 29 Mar 2013 17:32:44 +0000 (17:32 +0000)]

Merge "Scope certs for wifi UID and handle migration" into jb-mr2-dev

commit | commitdiff | tree

Raph Levien [Fri, 29 Mar 2013 17:06:04 +0000 (10:06 -0700)]

am 76a40744: Merge "Switch indic fonts to Noto" into jb-mr2-dev

* commit '76a407442e0567e6c658cab546c32efc92711dc0':
Switch indic fonts to Noto

commit | commitdiff | tree

Raph Levien [Fri, 29 Mar 2013 17:02:16 +0000 (10:02 -0700)]

am 8fed6bc8: Merge "Make zero width space a line breaker" into jb-mr2-dev

* commit '8fed6bc894a993a195ebcb8e8772b725cd828f0d':
Make zero width space a line breaker

commit | commitdiff | tree

Raph Levien [Fri, 29 Mar 2013 17:01:31 +0000 (17:01 +0000)]

Merge "Switch indic fonts to Noto" into jb-mr2-dev

commit | commitdiff | tree

Raph Levien [Fri, 29 Mar 2013 16:58:33 +0000 (16:58 +0000)]

Merge "Make zero width space a line breaker" into jb-mr2-dev

commit | commitdiff | tree

Dianne Hackborn [Fri, 29 Mar 2013 16:57:54 +0000 (09:57 -0700)]

am cb5a4bf2: Merge "Apparently SystemUI no longer needs the carousel." into jb-mr2-dev

* commit 'cb5a4bf2ee4a2089c8dd6b71d197c63319a97ff6':
Apparently SystemUI no longer needs the carousel.

commit | commitdiff | tree

The Android Open Source Project [Fri, 29 Mar 2013 16:54:34 +0000 (09:54 -0700)]

am 3cea00ac: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '3cea00acfa2f2e9722ad7db4b674f9f0d0f52f8d':
  Update layers to clear them Bug #8489505
  Crank up the mOomMinFreeHigh values by 50%.
  Fix an action bar menu order of operations bug
  Fix bug #8487785 Notification shade has text overlapping the icon

commit | commitdiff | tree

Jean-Michel Trivi [Fri, 29 Mar 2013 16:54:15 +0000 (09:54 -0700)]

am bc43b4c2: RemoteControlClient can report current position, speed

* commit 'bc43b4c2f24fd03c0d0546895c97918c1736d9fb':
RemoteControlClient can report current position, speed

commit | commitdiff | tree

Dianne Hackborn [Fri, 29 Mar 2013 16:53:54 +0000 (16:53 +0000)]

Merge "Apparently SystemUI no longer needs the carousel." into jb-mr2-dev

commit | commitdiff | tree

The Android Open Source Project [Fri, 29 Mar 2013 16:48:56 +0000 (09:48 -0700)]

Reconcile with jb-mr2-release - do not merge

Change-Id: I82cfbeb6b54a3bb1225321fb5bb9d57b6ce1d821

commit | commitdiff | tree

Jean-Michel Trivi [Fri, 22 Mar 2013 16:30:50 +0000 (09:30 -0700)]

RemoteControlClient can report current position, speed

Extend RemoteControlClient class to support reporting the
current playback position, and the playback speed.
Define listener for an application to receive new playback
position to seek to (use of listener to be implemented).
Update IRemoteControlDisplay implementations to new interface.

bug 8120740

Change-Id: I2654daeca1ac49713d325df8226dceb85943c020

commit | commitdiff | tree

Raph Levien [Fri, 29 Mar 2013 16:25:48 +0000 (09:25 -0700)]

Make zero width space a line breaker

This patch makes ZWSP (U+200B, zero width space) a potential line break
in text layouts. This is a fix for bug 8501809.

Change-Id: I18c1f8464e6c821ff75f819141bacc714a878700

commit | commitdiff | tree

Victoria Lease [Fri, 29 Mar 2013 15:59:30 +0000 (08:59 -0700)]

am fef08dc1: am a4b68908: Merge "bidiFlags != SkPaint::Flags" into jb-mr2-dev

* commit 'fef08dc1c23fc3c7582e36df10d8a12acd22fb62':
bidiFlags != SkPaint::Flags

commit | commitdiff | tree

Victoria Lease [Fri, 29 Mar 2013 15:56:04 +0000 (08:56 -0700)]

am a4b68908: Merge "bidiFlags != SkPaint::Flags" into jb-mr2-dev

* commit 'a4b68908bdfefdf6c79a8b2c3d7bda00c543532f':
bidiFlags != SkPaint::Flags

commit | commitdiff | tree

Victoria Lease [Fri, 29 Mar 2013 15:00:50 +0000 (15:00 +0000)]

Merge "bidiFlags != SkPaint::Flags" into jb-mr2-dev

commit | commitdiff | tree

Fabrice Di Meglio [Fri, 29 Mar 2013 03:07:21 +0000 (20:07 -0700)]

Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode

- title should be "viewStart"
- link speed should be also "viewStart"

Change-Id: I8d85dd8b6850f8ae4c972dad40642c33b9004dce

commit | commitdiff | tree

Lorenzo Colitti [Fri, 29 Mar 2013 01:25:52 +0000 (18:25 -0700)]

am 742056ee: am 2fb669e6: Merge "Stop clat if it\'s no longer in use." into jb-mr2-dev

* commit '742056ee37e94cd51390527fea835112b29c8a94':
Stop clat if it's no longer in use.

commit | commitdiff | tree

Lorenzo Colitti [Fri, 29 Mar 2013 01:22:04 +0000 (18:22 -0700)]

am 2fb669e6: Merge "Stop clat if it\'s no longer in use." into jb-mr2-dev

* commit '2fb669e68f771f07517b8d5087ca875025b9bcfb':
Stop clat if it's no longer in use.

commit | commitdiff | tree

Lorenzo Colitti [Fri, 29 Mar 2013 01:17:43 +0000 (01:17 +0000)]

Merge "Stop clat if it's no longer in use." into jb-mr2-dev

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 01:15:02 +0000 (18:15 -0700)]

am 8706df1c: am 326e8bf8: am 84bba952: am 297409fe: am 3abd5a00: am ef47a8c4: am 6d9ff503: Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs

* commit '8706df1cb7a3964d9a6570a795368f4a78a58cf7':
Doc update: clarify rules for rate param

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 01:12:01 +0000 (18:12 -0700)]

am 326e8bf8: am 84bba952: am 297409fe: am 3abd5a00: am ef47a8c4: am 6d9ff503: Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs

* commit '326e8bf8264b8b89bc3deb1faa0c98a79ca7cac1':
Doc update: clarify rules for rate param

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 01:10:08 +0000 (18:10 -0700)]

am 84bba952: am 297409fe: am 3abd5a00: am ef47a8c4: am 6d9ff503: Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs

* commit '84bba9528c5d3baf22656746255b74e72b4555ff':
Doc update: clarify rules for rate param

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 01:07:59 +0000 (18:07 -0700)]

am 297409fe: am 3abd5a00: am ef47a8c4: am 6d9ff503: Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs

* commit '297409fefcfb2704162536562db9395903476b44':
Doc update: clarify rules for rate param

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 01:05:44 +0000 (18:05 -0700)]

am 3abd5a00: am ef47a8c4: am 6d9ff503: Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs

* commit '3abd5a00ab24299de00b6dfa9c73ff59e3f3360c':
Doc update: clarify rules for rate param

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 01:04:31 +0000 (18:04 -0700)]

am ef47a8c4: am 6d9ff503: Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs

* commit 'ef47a8c48a29ae73e4a7a1386def8fcd10b0044c':
Doc update: clarify rules for rate param

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 01:03:07 +0000 (18:03 -0700)]

am 6d9ff503: Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs

* commit '6d9ff5033e2985ed106b24d63a2bf5a8827170ed':
Doc update: clarify rules for rate param

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 01:00:10 +0000 (01:00 +0000)]

Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 00:47:52 +0000 (17:47 -0700)]

Doc update: clarify rules for rate param

"Bug: 5581113"

Change-Id: Ic87f1c331fba2b08de295b2d77832739bf823500

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 00:31:52 +0000 (17:31 -0700)]

am d0bc2d8d: am 798bb617: am 5652935a: am 5a5ff0b8: am 6754e05b: am c1fbc91b: am a42ddee1: Merge "Doc update: fix broken XML causing prob in View" into jb-mr1.1-docs

* commit 'd0bc2d8d7f087558d5ec0db349347df2cc555afd':
Doc update: fix broken XML causing prob in View

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 00:29:27 +0000 (17:29 -0700)]

am 798bb617: am 5652935a: am 5a5ff0b8: am 6754e05b: am c1fbc91b: am a42ddee1: Merge "Doc update: fix broken XML causing prob in View" into jb-mr1.1-docs

* commit '798bb6175ffdb473dd135f3167f01559fd5db9ef':
Doc update: fix broken XML causing prob in View

commit | commitdiff | tree

Romain Guy [Thu, 28 Mar 2013 20:06:58 +0000 (13:06 -0700)]

Update layers to clear them
Bug #8489505

A layer should be updated even with an empty deferred display list. It is
possible for a layer to request an update just to execute a clear which
will be handled by LayerRenderer::prepareDirty().

Change-Id: Iffb98bd71d6caa8d4a701df98197676f9423c0c2

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 00:27:26 +0000 (17:27 -0700)]

am 5652935a: am 5a5ff0b8: am 6754e05b: am c1fbc91b: am a42ddee1: Merge "Doc update: fix broken XML causing prob in View" into jb-mr1.1-docs

* commit '5652935aef0a1a9ecb6eef5550eb0e6a52999135':
Doc update: fix broken XML causing prob in View

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 00:25:18 +0000 (17:25 -0700)]

am 5a5ff0b8: am 6754e05b: am c1fbc91b: am a42ddee1: Merge "Doc update: fix broken XML causing prob in View" into jb-mr1.1-docs

* commit '5a5ff0b807f456055a7eadb46bca7f674585529d':
Doc update: fix broken XML causing prob in View

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 00:23:03 +0000 (17:23 -0700)]

am 6754e05b: am c1fbc91b: am a42ddee1: Merge "Doc update: fix broken XML causing prob in View" into jb-mr1.1-docs

* commit '6754e05b4e034a5118d669a547708c7adebd3202':
Doc update: fix broken XML causing prob in View

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 00:20:48 +0000 (17:20 -0700)]

am c1fbc91b: am a42ddee1: Merge "Doc update: fix broken XML causing prob in View" into jb-mr1.1-docs

* commit 'c1fbc91b78b0cb9ff6c6398846d984afc2fd541f':
Doc update: fix broken XML causing prob in View

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 00:18:12 +0000 (17:18 -0700)]

am a42ddee1: Merge "Doc update: fix broken XML causing prob in View" into jb-mr1.1-docs

* commit 'a42ddee1c2fad01521812ffde5968b9e92487caa':
Doc update: fix broken XML causing prob in View

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 00:16:21 +0000 (00:16 +0000)]

Merge "Doc update: fix broken XML causing prob in View" into jb-mr1.1-docs

commit | commitdiff | tree

kmccormick [Fri, 29 Mar 2013 00:01:21 +0000 (17:01 -0700)]

Doc update: fix broken XML causing prob in View

"Bug: 5873694"

Change-Id: I2b2a822538886825f8a863c741f2aebb665883f8

commit | commitdiff | tree

Kenny Root [Thu, 28 Mar 2013 23:58:54 +0000 (16:58 -0700)]

am 005f90b5: am 709f140b: am e89ebc76: am ce7f2723: Merge "AndroidKeyStore: add Builder for param spec"

* commit '005f90b5bec2f789dbf6031ef3d1cfbb5e52f503':
AndroidKeyStore: add Builder for param spec

commit | commitdiff | tree

Geremy Condra [Thu, 28 Mar 2013 23:58:51 +0000 (16:58 -0700)]

am a54e0643: am 9d034deb: am 24948d3c: am 946a5c91: Merge "Save off the seinfo value with packages.list."

* commit 'a54e064365706d40c55c2984cca1f15a6bf3e8fb':
Save off the seinfo value with packages.list.

commit | commitdiff | tree

Kenny Root [Thu, 28 Mar 2013 23:57:27 +0000 (16:57 -0700)]

am 709f140b: am e89ebc76: am ce7f2723: Merge "AndroidKeyStore: add Builder for param spec"

* commit '709f140bea3974a30c68e99f507563854acad1dd':
AndroidKeyStore: add Builder for param spec