OSDN Git Service
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
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
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
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
Raph Levien [Fri, 29 Mar 2013 17:01:31 +0000 (17:01 +0000)]
Merge "Switch indic fonts to Noto" into jb-mr2-dev
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
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.
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
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
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
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
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
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
Victoria Lease [Fri, 29 Mar 2013 15:00:50 +0000 (15:00 +0000)]
Merge "bidiFlags != SkPaint::Flags" into jb-mr2-dev
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.
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
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
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
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
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
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
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
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
kmccormick [Fri, 29 Mar 2013 00:47:52 +0000 (17:47 -0700)]
Doc update: clarify rules for rate param
"Bug:
5581113"
Change-Id: Ic87f1c331fba2b08de295b2d77832739bf823500
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
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
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
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
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
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
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
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
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
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
Geremy Condra [Thu, 28 Mar 2013 23:57:25 +0000 (16:57 -0700)]
am
9d034deb: am
24948d3c: am
946a5c91: Merge "Save off the seinfo value with packages.list."
* commit '
9d034debdd7226ea33530143710fcb962144be22':
Save off the seinfo value with packages.list.
Kenny Root [Thu, 28 Mar 2013 23:55:06 +0000 (16:55 -0700)]
am
e89ebc76: am
ce7f2723: Merge "AndroidKeyStore: add Builder for param spec"
* commit '
e89ebc767e554415d5ead323bb48012f15760046':
AndroidKeyStore: add Builder for param spec
Geremy Condra [Thu, 28 Mar 2013 23:55:03 +0000 (16:55 -0700)]
am
24948d3c: am
946a5c91: Merge "Save off the seinfo value with packages.list."
* commit '
24948d3ca7ff7fa70ee85e9aa7530239d7b482b2':
Save off the seinfo value with packages.list.
Kenny Root [Thu, 28 Mar 2013 23:52:52 +0000 (16:52 -0700)]
am
ce7f2723: Merge "AndroidKeyStore: add Builder for param spec"
* commit '
ce7f2723ad42f09fb173a9b86d3546e1474fd667':
AndroidKeyStore: add Builder for param spec
Geremy Condra [Thu, 28 Mar 2013 23:52:49 +0000 (16:52 -0700)]
am
946a5c91: Merge "Save off the seinfo value with packages.list."
* commit '
946a5c91d95daea8e12c235f003abbd3191b57b2':
Save off the seinfo value with packages.list.
kmccormick [Thu, 28 Mar 2013 23:49:43 +0000 (16:49 -0700)]
am
eff1151d: am
0de7af1e: am
c9c63003: am
fd245a2e: am
593c0dbf: am
378d4367: Merge "Doc update: misc fixes" into jb-mr1.1-docs
* commit '
eff1151d6c66bb7ab4fcf1a2ce0f92c2770ae886':
Doc update: misc fixes
kmccormick [Thu, 28 Mar 2013 23:47:25 +0000 (16:47 -0700)]
am
0de7af1e: am
c9c63003: am
fd245a2e: am
593c0dbf: am
378d4367: Merge "Doc update: misc fixes" into jb-mr1.1-docs
* commit '
0de7af1e18a72a979baa9711e4e980b21cf80255':
Doc update: misc fixes
Romain Guy [Thu, 28 Mar 2013 23:46:04 +0000 (16:46 -0700)]
am
5399a564: Merge "Update layers to clear them Bug #
8489505" into jb-mr2-dev
* commit '
5399a5648fb6756a7e7429b07a5a36493ff00395':
Update layers to clear them Bug #
8489505
kmccormick [Thu, 28 Mar 2013 23:45:16 +0000 (16:45 -0700)]
am
c9c63003: am
fd245a2e: am
593c0dbf: am
378d4367: Merge "Doc update: misc fixes" into jb-mr1.1-docs
* commit '
c9c63003b2e30c068a1bc9eba7683b75ca272180':
Doc update: misc fixes
kmccormick [Thu, 28 Mar 2013 23:43:26 +0000 (16:43 -0700)]
am
fd245a2e: am
593c0dbf: am
378d4367: Merge "Doc update: misc fixes" into jb-mr1.1-docs
* commit '
fd245a2ed78fd2b39c6d09ad0b1d84c275544c33':
Doc update: misc fixes
Romain Guy [Thu, 28 Mar 2013 23:42:41 +0000 (23:42 +0000)]
Merge "Update layers to clear them Bug #
8489505" into jb-mr2-dev
kmccormick [Thu, 28 Mar 2013 23:42:09 +0000 (16:42 -0700)]
am
593c0dbf: am
378d4367: Merge "Doc update: misc fixes" into jb-mr1.1-docs
* commit '
593c0dbf255dd5b3766372ac26eb9b3da1957852':
Doc update: misc fixes
kmccormick [Thu, 28 Mar 2013 23:39:53 +0000 (16:39 -0700)]
am
378d4367: Merge "Doc update: misc fixes" into jb-mr1.1-docs
* commit '
378d43677b45ec8dc629bc18f360d35f13c9ffec':
Doc update: misc fixes
kmccormick [Thu, 28 Mar 2013 23:36:44 +0000 (23:36 +0000)]
Merge "Doc update: misc fixes" into jb-mr1.1-docs
Eric Laurent [Thu, 28 Mar 2013 23:33:46 +0000 (16:33 -0700)]
am
dac3fd9d: Merge "audio service: fix BT SCO intent permission again" into jb-mr2-dev
* commit '
dac3fd9d90daffb4f6b08c788184ff38523348ba':
audio service: fix BT SCO intent permission again
kmccormick [Thu, 28 Mar 2013 23:33:11 +0000 (16:33 -0700)]
Doc update: misc fixes
"Bug:
3424410"
Some of these had already been fixed.
Change-Id: I1d0ab3a8fa51aa308186059db4186e7a7d24e9f8
kmccormick [Thu, 28 Mar 2013 23:30:13 +0000 (16:30 -0700)]
am
af7c60be: am
a25c43f5: am
3121868c: am
38e94e9f: am
4d0beb7e: am
4f414b79: Doc update: fix incorrect enum
* commit '
af7c60be4d18381bfd70b079f1c57480b0c3aea8':
Doc update: fix incorrect enum
Eric Laurent [Thu, 28 Mar 2013 23:28:02 +0000 (23:28 +0000)]
Merge "audio service: fix BT SCO intent permission again" into jb-mr2-dev
kmccormick [Thu, 28 Mar 2013 23:27:23 +0000 (16:27 -0700)]
am
a25c43f5: am
3121868c: am
38e94e9f: am
4d0beb7e: am
4f414b79: Doc update: fix incorrect enum
* commit '
a25c43f5545c7d9b7e94f2bb10d64ed7d7302b49':
Doc update: fix incorrect enum
kmccormick [Thu, 28 Mar 2013 23:24:25 +0000 (16:24 -0700)]
am
3121868c: am
38e94e9f: am
4d0beb7e: am
4f414b79: Doc update: fix incorrect enum
* commit '
3121868cb860eb47182fcbae5d55667af51afb5a':
Doc update: fix incorrect enum
kmccormick [Thu, 28 Mar 2013 23:22:29 +0000 (16:22 -0700)]
am
38e94e9f: am
4d0beb7e: am
4f414b79: Doc update: fix incorrect enum
* commit '
38e94e9f820ffd9eeda8ccb92ee77183cc870dde':
Doc update: fix incorrect enum
kmccormick [Thu, 28 Mar 2013 23:19:37 +0000 (16:19 -0700)]
am
4d0beb7e: am
4f414b79: Doc update: fix incorrect enum
* commit '
4d0beb7e54ed37cf9e854b793983046478233fdf':
Doc update: fix incorrect enum
kmccormick [Thu, 28 Mar 2013 23:17:23 +0000 (16:17 -0700)]
am
4f414b79: Doc update: fix incorrect enum
* commit '
4f414b7949a969c1e1cb0597155bca1d3aa2c455':
Doc update: fix incorrect enum
kmccormick [Thu, 28 Mar 2013 23:13:32 +0000 (16:13 -0700)]
Doc update: fix incorrect enum
"Bug:
4980236"
Change-Id: I39f8f429574a9916c5fffc5b2e4ec4715ec48803
Kenny Root [Thu, 28 Mar 2013 23:13:28 +0000 (23:13 +0000)]
Merge "AndroidKeyStore: add Builder for param spec"
Eric Laurent [Thu, 28 Mar 2013 23:10:45 +0000 (16:10 -0700)]
audio service: fix BT SCO intent permission again
Commit
2a57ca93 did not address the calling permission
for setMode() method which can also indirectly call
BluetoothHeadset APIs.
Bug
8242429
Change-Id: I8483c0492836192f47984c48629291cb261b001b
Matthew Xie [Thu, 28 Mar 2013 23:07:18 +0000 (16:07 -0700)]
am
84e594f7: Merge "Unhide Bluetooth Low Energy public APIs" into jb-mr2-dev
* commit '
84e594f7dbe6108a2c6c57d5d9d941d0b0563b4b':
Unhide Bluetooth Low Energy public APIs
Kenny Root [Thu, 28 Mar 2013 22:05:03 +0000 (15:05 -0700)]
AndroidKeyStore: add Builder for param spec
Change-Id: I13403197e1ac7ac607efa10979eb73bde0135a2a
Matthew Xie [Thu, 28 Mar 2013 23:04:47 +0000 (23:04 +0000)]
Merge "Unhide Bluetooth Low Energy public APIs" into jb-mr2-dev
Victoria Lease [Wed, 27 Mar 2013 22:35:53 +0000 (15:35 -0700)]
bidiFlags != SkPaint::Flags
We've a number of native functions in the text layout path that take
a bidiFlags argument. We've a number of callers of those functions
passing in SkPaint::Flags in that slot. This completely breaks text
directionality for the affected functions, as
SkPaint::kAntiAlias_Flag happens to share values with kBidi_RTL,
resulting in anti-aliased SkPaints measuring text as if it were RTL,
and non-anti-aliased SkPaints measuring text as if it were LTR,
regardless of the actual text directionality. Oops!
To address the issue, this commit replaces erroneous calls to
SkPaint.getFlags() with the value of Paint.mBidiFlags, and includes
the necessary plumbing to get that value where it needs to be.
Bug:
8471481
Change-Id: I2d04b70defed3130fc1ad13f4c9098f5fce4ffde
Ben Cheng [Thu, 28 Mar 2013 00:36:13 +0000 (17:36 -0700)]
Crank up the mOomMinFreeHigh values by 50%.
Devices with 1GB of RAM can benefit from more aggressive OOM killer.
BUG:
7972252
Change-Id: Id2b80c14a3cff195c17ef0d14c80b92394649d98
Matthew Xie [Sat, 2 Mar 2013 02:41:02 +0000 (18:41 -0800)]
Unhide Bluetooth Low Energy public APIs
Updated API headers. Add BluetoothManager to be retrieved by
context.getSystemService(Context.BLUETOOTH_SERVICE).
LE scan functions are placed in BluetoothAdapter
The GATT API are device driven instead of a profile-driver.
bug
8450158
Change-Id: I424a4cedaac3ef8120a05996500008dd210d2553
kmccormick [Thu, 28 Mar 2013 22:34:38 +0000 (15:34 -0700)]
am
80ab68ce: am
5c3ddcd1: am
425c3d5f: am
99049335: am
3ed65cb3: am
689e827a: Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs
* commit '
80ab68ce233598ab13a9875fe17d4ec51aa5517b':
Doc update: superceeded > superseded
kmccormick [Thu, 28 Mar 2013 22:30:46 +0000 (15:30 -0700)]
am
5c3ddcd1: am
425c3d5f: am
99049335: am
3ed65cb3: am
689e827a: Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs
* commit '
5c3ddcd14b79c4737ea06f68d8efd39543d60382':
Doc update: superceeded > superseded
kmccormick [Thu, 28 Mar 2013 22:27:54 +0000 (15:27 -0700)]
am
425c3d5f: am
99049335: am
3ed65cb3: am
689e827a: Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs
* commit '
425c3d5f59f1e315cdbdd5f7530c4380aabf76ab':
Doc update: superceeded > superseded
kmccormick [Thu, 28 Mar 2013 22:26:25 +0000 (15:26 -0700)]
am
99049335: am
3ed65cb3: am
689e827a: Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs
* commit '
99049335a604cae3f515fce32bc5f1b27fe8d29b':
Doc update: superceeded > superseded
kmccormick [Thu, 28 Mar 2013 22:24:39 +0000 (15:24 -0700)]
am
3ed65cb3: am
689e827a: Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs
* commit '
3ed65cb3496afe90d82bfadbff4d2687189ae47d':
Doc update: superceeded > superseded
kmccormick [Thu, 28 Mar 2013 22:23:08 +0000 (15:23 -0700)]
am
689e827a: Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs
* commit '
689e827aa3fa69d20087972dfb93ed257e4d109b':
Doc update: superceeded > superseded
kmccormick [Thu, 28 Mar 2013 22:21:12 +0000 (22:21 +0000)]
Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs
kmccormick [Thu, 28 Mar 2013 22:17:15 +0000 (15:17 -0700)]
Doc update: superceeded > superseded
"Bug:
5935672"
Change-Id: Ie2324d00d454cf3f3f3ed422dea2017b8a7a4c54
Eric Laurent [Thu, 28 Mar 2013 22:10:03 +0000 (15:10 -0700)]
am
7692d1f1: Merge "Display vibrate icon in volume panel" into jb-mr2-dev
* commit '
7692d1f1654975ef0ef59e6b8dc881299194babf':
Display vibrate icon in volume panel
Eric Laurent [Thu, 28 Mar 2013 22:08:05 +0000 (22:08 +0000)]
Merge "Display vibrate icon in volume panel" into jb-mr2-dev
Geremy Condra [Thu, 28 Mar 2013 21:45:22 +0000 (21:45 +0000)]
Merge "Save off the seinfo value with packages.list."
Raph Levien [Thu, 28 Mar 2013 21:39:06 +0000 (14:39 -0700)]
Switch indic fonts to Noto
This change switches from the older (cibu and lohit) Indic fonts to
the new Noto fonts. All the new fonts come in both normal and bold
weights, and with system ui (more compact vertical metrics, to match
Roboto) variants as well as normal.
The fonts have been tested on a phone (Galaxy Nexus) and seem to work,
but should be more carefully evaluated by native speakers.
Change-Id: Ib0a10ee5a130bab258ff198e22b8304e00141073
Kenny Root [Thu, 28 Mar 2013 21:31:15 +0000 (14:31 -0700)]
am
e861f4a3: am
d4b8baf3: am
02c86306: Merge "Add ability to install credentials as other UID"
* commit '
e861f4a3a50a41ffc372e4d7d47a5205c51f9252':
Add ability to install credentials as other UID
Elliott Hughes [Thu, 28 Mar 2013 21:31:11 +0000 (14:31 -0700)]
am
94eaab4a: am
3ae30483: am
a19647d3: Merge "Correct executable bit for source files [Take 2]"
* commit '
94eaab4a5ddd6db4bcbc8a1e65a4d8e60d1d1274':
Correct executable bit for source files [Take 2]
Geremy Condra [Thu, 28 Mar 2013 21:31:08 +0000 (14:31 -0700)]
am
5c3bd37a: am
f21a34bf: am
2ff853da: Merge "Add data validation on seinfo labels."
* commit '
5c3bd37ab7b18bd5c3ea4bfcb86cc0a30c10d534':
Add data validation on seinfo labels.
Kenny Root [Thu, 28 Mar 2013 21:29:24 +0000 (14:29 -0700)]
am
d4b8baf3: am
02c86306: Merge "Add ability to install credentials as other UID"
* commit '
d4b8baf3ed81582bf1b53b263893b2524641868e':
Add ability to install credentials as other UID
Elliott Hughes [Thu, 28 Mar 2013 21:29:21 +0000 (14:29 -0700)]
am
3ae30483: am
a19647d3: Merge "Correct executable bit for source files [Take 2]"
* commit '
3ae30483777708ff3a4f59a4fa75c6a76213cc30':
Correct executable bit for source files [Take 2]
Geremy Condra [Thu, 28 Mar 2013 21:29:17 +0000 (14:29 -0700)]
am
f21a34bf: am
2ff853da: Merge "Add data validation on seinfo labels."
* commit '
f21a34bf1b188cd662f6a08f5c709f4f641b1494':
Add data validation on seinfo labels.
Kenny Root [Thu, 28 Mar 2013 21:27:13 +0000 (14:27 -0700)]
am
02c86306: Merge "Add ability to install credentials as other UID"
* commit '
02c86306d2569d18a49da3d9228dacb25b1f8973':
Add ability to install credentials as other UID
Elliott Hughes [Thu, 28 Mar 2013 21:27:09 +0000 (14:27 -0700)]
am
a19647d3: Merge "Correct executable bit for source files [Take 2]"
* commit '
a19647d3d81d3bdd15ad3bc8a2ece8e7bd1095fe':
Correct executable bit for source files [Take 2]
Geremy Condra [Thu, 28 Mar 2013 21:27:06 +0000 (14:27 -0700)]
am
2ff853da: Merge "Add data validation on seinfo labels."
* commit '
2ff853daa89ca47491c3f7b096872a432d4a19e7':
Add data validation on seinfo labels.
Kenny Root [Thu, 28 Mar 2013 20:56:58 +0000 (20:56 +0000)]
Merge "Add ability to install credentials as other UID"
Ying Wang [Thu, 28 Mar 2013 20:55:53 +0000 (13:55 -0700)]
am
6a9d93ac: Merge "Fix doc build." into jb-mr2-dev
* commit '
6a9d93ac478a3c971f72197282de13ff0905f1ef':
Fix doc build.
Ying Wang [Thu, 28 Mar 2013 20:52:43 +0000 (20:52 +0000)]
Merge "Fix doc build." into jb-mr2-dev
Ying Wang [Thu, 28 Mar 2013 20:50:40 +0000 (13:50 -0700)]
Fix doc build.
Change-Id: I479df06f2aed33bf29bb8d90be2339a80248beaa
Elliott Hughes [Thu, 28 Mar 2013 20:50:34 +0000 (20:50 +0000)]
Merge "Correct executable bit for source files [Take 2]"
Chris Craik [Thu, 28 Mar 2013 20:49:09 +0000 (13:49 -0700)]
am
dc1975ea: Merge "Fix issues related to saveLayer/restore deferral" into jb-mr2-dev
* commit '
dc1975ea717cdafb914fd00ea781fd314e1ac478':
Fix issues related to saveLayer/restore deferral
Chris Craik [Thu, 28 Mar 2013 20:46:47 +0000 (20:46 +0000)]
Merge "Fix issues related to saveLayer/restore deferral" into jb-mr2-dev
Amith Yamasani [Thu, 28 Mar 2013 20:34:52 +0000 (13:34 -0700)]
am
e494a81f: Merge "Restricted account visibility" into jb-mr2-dev
* commit '
e494a81f9b2727edd1c537f34bf0ea83b2fb0097':
Restricted account visibility
Amith Yamasani [Thu, 28 Mar 2013 20:31:44 +0000 (20:31 +0000)]
Merge "Restricted account visibility" into jb-mr2-dev
Geremy Condra [Thu, 28 Mar 2013 20:30:36 +0000 (20:30 +0000)]
Merge "Add data validation on seinfo labels."
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
Ben Cheng [Thu, 28 Mar 2013 20:04:45 +0000 (13:04 -0700)]
am
3eba5ad1: Merge "Crank up the mOomMinFreeHigh values by 50%." into jb-mr2-dev
* commit '
3eba5ad1e24e8aacb4a8ff0f384f02d2c2474325':
Crank up the mOomMinFreeHigh values by 50%.
Ben Cheng [Thu, 28 Mar 2013 19:59:54 +0000 (19:59 +0000)]
Merge "Crank up the mOomMinFreeHigh values by 50%." into jb-mr2-dev