OSDN Git Service
Zhijun He [Tue, 18 Feb 2014 19:10:37 +0000 (19:10 +0000)]
Merge "Camera2: Update java doc for tone.map.curveRed key"
John Spurlock [Tue, 18 Feb 2014 18:10:33 +0000 (18:10 +0000)]
Merge "Content inset hint should consult PolicyControl."
Jessica Hummel [Tue, 18 Feb 2014 17:31:29 +0000 (17:31 +0000)]
Merge "Change API for setProfileOwner to require userId"
Jeff Sharkey [Tue, 18 Feb 2014 17:26:17 +0000 (17:26 +0000)]
am
ab528077: am
37d894a4: am
660a514e: am
60097a9c: Merge "Structure device not freed in error case"
* commit '
ab5280776f40c473228d3e920771a41289ed7fee':
Structure device not freed in error case
Jeff Sharkey [Tue, 18 Feb 2014 17:22:23 +0000 (17:22 +0000)]
am
fef3dd01: am
41185c84: am
df47ecaa: am
02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT"
* commit '
fef3dd01fbad923bf7ff509f4ee95312fd7cb4db':
Tethering: Skip link local addresses when enabling NAT
Jeff Sharkey [Tue, 18 Feb 2014 17:22:18 +0000 (17:22 +0000)]
am
392ee12f: am
96190f1c: am
e6d256c5: am
234b0b03: Merge "Fix, MountService now only sends one onShutDownComplete"
* commit '
392ee12fd57870e1e8f0777d03295b0435babd1f':
Fix, MountService now only sends one onShutDownComplete
Jeff Sharkey [Tue, 18 Feb 2014 17:22:15 +0000 (17:22 +0000)]
am
37d894a4: am
660a514e: am
60097a9c: Merge "Structure device not freed in error case"
* commit '
37d894a42b5744e3e5def5fbfcc641fe3afa2063':
Structure device not freed in error case
Jeff Sharkey [Tue, 18 Feb 2014 17:19:38 +0000 (17:19 +0000)]
am
660a514e: am
60097a9c: Merge "Structure device not freed in error case"
* commit '
660a514e80e0019d8c6632e84bd03491722fc2ab':
Structure device not freed in error case
Jeff Sharkey [Tue, 18 Feb 2014 17:18:12 +0000 (17:18 +0000)]
am
41185c84: am
df47ecaa: am
02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT"
* commit '
41185c844fa7986ff3e5daa4c11288f6bed1463b':
Tethering: Skip link local addresses when enabling NAT
Jeff Sharkey [Tue, 18 Feb 2014 17:18:09 +0000 (17:18 +0000)]
am
96190f1c: am
e6d256c5: am
234b0b03: Merge "Fix, MountService now only sends one onShutDownComplete"
* commit '
96190f1c054e2e34ac741de1d7afb2f6645d218c':
Fix, MountService now only sends one onShutDownComplete
Jeff Sharkey [Tue, 18 Feb 2014 17:16:31 +0000 (09:16 -0800)]
am
60097a9c: Merge "Structure device not freed in error case"
* commit '
60097a9c5a7214cb73d0bc966adef767743f8798':
Structure device not freed in error case
Jeff Sharkey [Tue, 18 Feb 2014 17:15:44 +0000 (17:15 +0000)]
am
df47ecaa: am
02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT"
* commit '
df47ecaa0973b80c9b97ef9ed3ad7abcfef361c7':
Tethering: Skip link local addresses when enabling NAT
Jeff Sharkey [Tue, 18 Feb 2014 17:15:39 +0000 (17:15 +0000)]
am
e6d256c5: am
234b0b03: Merge "Fix, MountService now only sends one onShutDownComplete"
* commit '
e6d256c50b0709378a5bfff0ae27eb7cf6cc3894':
Fix, MountService now only sends one onShutDownComplete
Jeff Sharkey [Tue, 18 Feb 2014 17:13:00 +0000 (09:13 -0800)]
am
02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT"
* commit '
02a64daefece8ccdc40935c7bc865a8966249c44':
Tethering: Skip link local addresses when enabling NAT
Jeff Sharkey [Tue, 18 Feb 2014 17:12:57 +0000 (09:12 -0800)]
am
234b0b03: Merge "Fix, MountService now only sends one onShutDownComplete"
* commit '
234b0b037ee1f8dc50c846279216a8e4d779ff56':
Fix, MountService now only sends one onShutDownComplete
Jeff Sharkey [Tue, 18 Feb 2014 17:12:14 +0000 (17:12 +0000)]
Merge "Structure device not freed in error case"
Jeff Sharkey [Tue, 18 Feb 2014 17:11:09 +0000 (17:11 +0000)]
Merge "Tethering: Skip link local addresses when enabling NAT"
Jeff Sharkey [Tue, 18 Feb 2014 17:10:02 +0000 (17:10 +0000)]
Merge "Fix, MountService now only sends one onShutDownComplete"
John Spurlock [Tue, 18 Feb 2014 16:18:59 +0000 (11:18 -0500)]
Content inset hint should consult PolicyControl.
Missed instance of sysuivis modification from prior commit.
Change-Id: I40af7da262a00a3a379234f42444e49883d76270
Baligh Uddin [Tue, 18 Feb 2014 04:30:33 +0000 (04:30 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 17 Feb 2014 22:09:14 +0000 (14:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: I735b0a0de031b145b54b9cf643b7e91bb40c426d
Auto-generated-cl: translation import
Baligh Uddin [Mon, 17 Feb 2014 22:02:21 +0000 (14:02 -0800)]
Import translations. DO NOT MERGE
Change-Id: I15e4f6e6e8ae10556df4031bcc7c5ba6369f8ece
Auto-generated-cl: translation import
Deepanshu Gupta [Mon, 17 Feb 2014 19:28:16 +0000 (19:28 +0000)]
Merge "Fix layoutlib by avoiding Java7 calls"
Deepanshu Gupta [Fri, 14 Feb 2014 23:21:53 +0000 (15:21 -0800)]
Fix layoutlib by avoiding Java7 calls
This change also fixes a NPE in TypedArray caused by changes in the
framework.
Change-Id: Ie64237c567fa16c35c807db22ce9a4b609ee411d
Narayan Kamath [Mon, 17 Feb 2014 18:32:44 +0000 (18:32 +0000)]
am
94b7c749: am
37e6af75: am
92a09fbd: am
a14d9c31: Merge "Move Json{Reader,Writer} test to cts."
* commit '
94b7c749fd0bc5bbd80dbabfd412c2a212584343':
Move Json{Reader,Writer} test to cts.
Narayan Kamath [Mon, 17 Feb 2014 18:29:35 +0000 (18:29 +0000)]
am
37e6af75: am
92a09fbd: am
a14d9c31: Merge "Move Json{Reader,Writer} test to cts."
* commit '
37e6af75e19b43d7a41c6296b6f722defd0f3172':
Move Json{Reader,Writer} test to cts.
Narayan Kamath [Mon, 17 Feb 2014 18:27:13 +0000 (18:27 +0000)]
am
92a09fbd: am
a14d9c31: Merge "Move Json{Reader,Writer} test to cts."
* commit '
92a09fbdebae5362633db281bc155ed1f1145588':
Move Json{Reader,Writer} test to cts.
Narayan Kamath [Mon, 17 Feb 2014 18:23:56 +0000 (10:23 -0800)]
am
a14d9c31: Merge "Move Json{Reader,Writer} test to cts."
* commit '
a14d9c318a1d358902a76aff733303c5509bb5fc':
Move Json{Reader,Writer} test to cts.
Narayan Kamath [Mon, 17 Feb 2014 18:20:33 +0000 (18:20 +0000)]
Merge "Move Json{Reader,Writer} test to cts."
Narayan Kamath [Mon, 17 Feb 2014 17:51:43 +0000 (17:51 +0000)]
Move Json{Reader,Writer} test to cts.
These tests aren't really run automatically (or perhaps
even manually) in their present location, and increasing
CTS coverage is never a bad thing.
Change-Id: I81cce1211021011dca551fde62e725e177ca4df0
Leon Scroggins [Thu, 13 Feb 2014 19:34:02 +0000 (14:34 -0500)]
Remove call to setIsOpaque (again).
The call was removed in I1b36b0b0ce7126031eb7b769b563c17dcd4b306a,
since setIsOpaque was deprecated in Skia.
It was accidentally reintroduced in
Id5793fa0ebc17ee8b1eecf4b3f327977fdccff71. This line is redundant
with the lines above it (which call the replacement for setIsOpaque,
setAlphaType).
Change-Id: I6520f796d639721987418ec0ecae82b3674dcbfd
Narayan Kamath [Mon, 17 Feb 2014 11:15:45 +0000 (11:15 +0000)]
am
ebfcf6cc: am
8c1fc834: am
28879bbf: am
be57fca4: Merge "Extended locales in AAPT / AssetManager."
* commit '
ebfcf6ccafe43b6538e986151cf55407b7b26979':
Extended locales in AAPT / AssetManager.
Narayan Kamath [Mon, 17 Feb 2014 11:15:41 +0000 (11:15 +0000)]
am
8f54f8d6: (-s ours) am
982931c7: am
183e5e03: am
49024bac: Merge "AssetManager support for 3 letter lang/country codes."
* commit '
8f54f8d6dcdb6249ccc76e14d61dc4d4e4af029e':
AssetManager support for 3 letter lang/country codes.
Narayan Kamath [Mon, 17 Feb 2014 11:10:11 +0000 (11:10 +0000)]
am
8c1fc834: am
28879bbf: am
be57fca4: Merge "Extended locales in AAPT / AssetManager."
* commit '
8c1fc83445f8dce7e6d0789feeed8bf98d33bf01':
Extended locales in AAPT / AssetManager.
Narayan Kamath [Mon, 17 Feb 2014 11:10:09 +0000 (11:10 +0000)]
am
982931c7: am
183e5e03: am
49024bac: Merge "AssetManager support for 3 letter lang/country codes."
* commit '
982931c72b6cd00c5eea28efc4b086f47f7aca17':
AssetManager support for 3 letter lang/country codes.
Narayan Kamath [Mon, 17 Feb 2014 11:06:38 +0000 (11:06 +0000)]
am
28879bbf: am
be57fca4: Merge "Extended locales in AAPT / AssetManager."
* commit '
28879bbfe89dc4bf2067a7183975ecffb82f68e6':
Extended locales in AAPT / AssetManager.
Narayan Kamath [Mon, 17 Feb 2014 11:06:31 +0000 (11:06 +0000)]
am
183e5e03: am
49024bac: Merge "AssetManager support for 3 letter lang/country codes."
* commit '
183e5e038bd844ac415b14f22df5c476732066c8':
AssetManager support for 3 letter lang/country codes.
Narayan Kamath [Mon, 17 Feb 2014 11:03:49 +0000 (03:03 -0800)]
am
be57fca4: Merge "Extended locales in AAPT / AssetManager."
* commit '
be57fca41a731217010d9f92554cf48708b06ecf':
Extended locales in AAPT / AssetManager.
Narayan Kamath [Mon, 17 Feb 2014 11:03:46 +0000 (03:03 -0800)]
am
49024bac: Merge "AssetManager support for 3 letter lang/country codes."
* commit '
49024bacf63db39467e7f318c682ad771ec0de22':
AssetManager support for 3 letter lang/country codes.
Narayan Kamath [Mon, 17 Feb 2014 11:00:29 +0000 (11:00 +0000)]
Merge "Extended locales in AAPT / AssetManager."
Narayan Kamath [Mon, 17 Feb 2014 11:00:14 +0000 (11:00 +0000)]
Merge "AssetManager support for 3 letter lang/country codes."
Adam Connors [Tue, 11 Feb 2014 13:59:46 +0000 (13:59 +0000)]
Change API for setProfileOwner to require userId
Previously the userId of the current process used but it
makes the provisioning process cleaner to be able to pass
it in explicitly.
Change-Id: I670c4cf3638f1340f6d0bf856c3e01045df8c29e
Zhijun He [Sun, 16 Feb 2014 05:47:51 +0000 (21:47 -0800)]
Camera2: Update java doc for tone.map.curveRed key
Change-Id: I39df3a14470a1f051ee3eb11866e7205ea7b16b6
Alan Viverette [Sat, 15 Feb 2014 01:54:48 +0000 (01:54 +0000)]
Merge "Remove unnecessary namespace from XML styles/themes"
Alan Viverette [Sat, 15 Feb 2014 01:50:45 +0000 (17:50 -0800)]
Remove unnecessary namespace from XML styles/themes
Change-Id: If706175f9164f9dcf7e3f9d6bdc7e1f74dba88cf
Zhijun He [Sat, 15 Feb 2014 01:34:57 +0000 (01:34 +0000)]
Merge "Camera2: Unhide some capture request templates"
Alan Viverette [Sat, 15 Feb 2014 01:13:55 +0000 (01:13 +0000)]
Merge "More Quantum theme boilerplate styles"
Alan Viverette [Sat, 15 Feb 2014 01:05:11 +0000 (17:05 -0800)]
More Quantum theme boilerplate styles
Change-Id: I3411e19cae11e487203420e051b2cf8f4d5ebc65
John Reck [Sat, 15 Feb 2014 01:03:02 +0000 (01:03 +0000)]
Merge "Refcounting is hard"
John Reck [Sat, 15 Feb 2014 00:59:37 +0000 (16:59 -0800)]
Refcounting is hard
Bug:
12994941
Change-Id: I6285ff818fc696dbe504174b98a54cb1d00b445c
Tim Murray [Sat, 15 Feb 2014 00:03:23 +0000 (00:03 +0000)]
am
afb4f8f1: am
8e30d53b: am
4870c813: am
7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter."
* commit '
afb4f8f144ef70360b70770e17e7d81571e7b296':
Fix destruction issues relating to AllocationAdapter.
Christopher Tate [Sat, 15 Feb 2014 00:01:19 +0000 (00:01 +0000)]
Merge "Clarify permission semantics"
Tim Murray [Sat, 15 Feb 2014 00:00:07 +0000 (00:00 +0000)]
am
8e30d53b: am
4870c813: am
7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter."
* commit '
8e30d53b6575a08ec0579fb08c8c4f055598d78b':
Fix destruction issues relating to AllocationAdapter.
Tim Murray [Fri, 14 Feb 2014 23:56:57 +0000 (23:56 +0000)]
am
4870c813: am
7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter."
* commit '
4870c813fe4a6fc7a176f22b5e7f96e9f7a4e469':
Fix destruction issues relating to AllocationAdapter.
Tim Murray [Fri, 14 Feb 2014 23:53:59 +0000 (15:53 -0800)]
am
7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter."
* commit '
7d1a6c5cac16795e5953d2b4d34671e34e907632':
Fix destruction issues relating to AllocationAdapter.
Tim Murray [Fri, 14 Feb 2014 23:50:08 +0000 (23:50 +0000)]
Merge "Fix destruction issues relating to AllocationAdapter."
Tim Murray [Wed, 12 Feb 2014 19:16:17 +0000 (11:16 -0800)]
Fix destruction issues relating to AllocationAdapter.
bug
12971201
Change-Id: I3d9f66f527a35837ac866a695bdcc41d908a2562
Christopher Tate [Fri, 14 Feb 2014 23:45:27 +0000 (15:45 -0800)]
Clarify permission semantics
Bug
12919011
Change-Id: I43a72801ddec04245ac6352eeda4cd0f14aea658
Ben Gruver [Fri, 14 Feb 2014 23:41:30 +0000 (23:41 +0000)]
am
d6739e0f: am
4f416144: am
da379447: am
509a243c: Merge "Check the return value of listFiles on the ifw directory"
* commit '
d6739e0f9dd0a5c633ed3cf484f8c0f723168757':
Check the return value of listFiles on the ifw directory
Tim Murray [Fri, 14 Feb 2014 23:41:24 +0000 (23:41 +0000)]
am
bdb04f02: am
17b7ff4a: am
b25a6936: am
d7043f00: Merge "Add hidden minor version ID for support lib workarounds."
* commit '
bdb04f025ce34b0240f01961c43d8156a78e27a2':
Add hidden minor version ID for support lib workarounds.
Ben Gruver [Fri, 14 Feb 2014 23:22:13 +0000 (23:22 +0000)]
am
4f416144: am
da379447: am
509a243c: Merge "Check the return value of listFiles on the ifw directory"
* commit '
4f4161442d1ac6c1a519a06df0e4efeab3072195':
Check the return value of listFiles on the ifw directory
Tim Murray [Fri, 14 Feb 2014 23:22:10 +0000 (23:22 +0000)]
am
17b7ff4a: am
b25a6936: am
d7043f00: Merge "Add hidden minor version ID for support lib workarounds."
* commit '
17b7ff4af762cd5e9921e9ee360e139956f220a5':
Add hidden minor version ID for support lib workarounds.
Ben Gruver [Fri, 14 Feb 2014 23:08:10 +0000 (23:08 +0000)]
am
da379447: am
509a243c: Merge "Check the return value of listFiles on the ifw directory"
* commit '
da37944785c47b2b92c1a0f79c5d602256859fe6':
Check the return value of listFiles on the ifw directory
Tim Murray [Fri, 14 Feb 2014 23:08:01 +0000 (23:08 +0000)]
am
b25a6936: am
d7043f00: Merge "Add hidden minor version ID for support lib workarounds."
* commit '
b25a6936a1b0dbabaf8ad8c2ce59e7251daa9e8c':
Add hidden minor version ID for support lib workarounds.
Michael Wright [Fri, 14 Feb 2014 22:38:06 +0000 (22:38 +0000)]
Merge "Remove Japanese button swap"
Ben Gruver [Fri, 14 Feb 2014 21:57:24 +0000 (13:57 -0800)]
am
509a243c: Merge "Check the return value of listFiles on the ifw directory"
* commit '
509a243c2c5ebc9cc55324bd9a03a5b560d81cfb':
Check the return value of listFiles on the ifw directory
Andy McFadden [Fri, 14 Feb 2014 21:45:20 +0000 (21:45 +0000)]
Merge "Update createInputSurface() doc"
Michael Wright [Thu, 13 Feb 2014 01:28:57 +0000 (17:28 -0800)]
Remove Japanese button swap
Bug:
12923922
Change-Id: I4960d8189e751514a595823d7ed9b273e3ff8eb8
Ben Gruver [Fri, 14 Feb 2014 21:15:49 +0000 (21:15 +0000)]
Merge "Check the return value of listFiles on the ifw directory"
Ben Gruver [Tue, 1 Oct 2013 00:03:34 +0000 (17:03 -0700)]
Check the return value of listFiles on the ifw directory
listFiles can return null if the directory doesn't exist
Bug:
10497143
Change-Id: Ie4cbdf18a259a9641669a4e6b9bf49b4879acc67
Alan Viverette [Fri, 14 Feb 2014 20:55:52 +0000 (20:55 +0000)]
Merge "Fix gradient radius type"
Alan Viverette [Fri, 14 Feb 2014 20:54:33 +0000 (12:54 -0800)]
Fix gradient radius type
BUG:
13029355
Change-Id: I5139d5da592b8bbf420a31895ae50c365538b9cf
Andy McFadden [Fri, 14 Feb 2014 18:06:31 +0000 (10:06 -0800)]
Update createInputSurface() doc
The Surface returned by MediaCodec#createInputSurface() is configured
for HW_VIDEO_ENCODER by the consumer. Accessing the Surface through
Surface#lockCanvas() sets SW_READ_OFTEN | SW_WRITE_OFTEN, and some
devices choke on the combination.
Bug
11418094
Change-Id: Ic182802386146d19b1bdecdb894c5130c563a3ed
Tim Murray [Fri, 14 Feb 2014 20:51:32 +0000 (12:51 -0800)]
am
d7043f00: Merge "Add hidden minor version ID for support lib workarounds."
* commit '
d7043f0084237200b6aab5d101c8ab6d3ab495c6':
Add hidden minor version ID for support lib workarounds.
Tim Murray [Fri, 14 Feb 2014 20:47:33 +0000 (20:47 +0000)]
Merge "Add hidden minor version ID for support lib workarounds."
Kenny Guy [Fri, 14 Feb 2014 19:30:25 +0000 (19:30 +0000)]
Merge "Extend pm create-user to handle related and managed users."
Kenny Guy [Fri, 14 Feb 2014 17:35:05 +0000 (17:35 +0000)]
Extend pm create-user to handle related and managed users.
Change-Id: I0a290b9debdc8ddf23b72a84bf98908ab7fa7c0d
Zhijun He [Fri, 14 Feb 2014 18:44:32 +0000 (10:44 -0800)]
Camera2: Unhide some capture request templates
Change-Id: I13a45b51c129ba562cce0374ae3c63e853144c10
rich cannings [Fri, 14 Feb 2014 18:04:45 +0000 (18:04 +0000)]
Merge "Make FORCE_STOP_PACKAGES "signature|system""
Paul Lawrence [Fri, 14 Feb 2014 15:24:59 +0000 (15:24 +0000)]
Merge "Support default, pattern, pin and password encryption types"
Narayan Kamath [Tue, 21 Jan 2014 15:32:36 +0000 (15:32 +0000)]
Extended locales in AAPT / AssetManager.
Support 3 letter language codes, script codes &
variants. The bulk of the changes are related to
the implementation of command line filtering of
locales etc. The previous code assumed that the
value of each "axis" (locale, density, size etc.)
could be represented by a 4 byte type. This is
no longer the case.
This change introduces a new class, AaptLocaleValue
which holds a (normalized) locale parsed from a
directory name or a filter string. This class takes
responsibility for parsing locales as well as
writing them to ResTable_config structures, which is
their representation in the resource table.
This includes minor changes at the java / JNI level
for AssetManager. We now call locale.toLanguageTag()
to give the native layer a well formed BCP-47 tag.
I've removed some duplicated parsing code in
AssetManager.cpp and replaced them with functions on
ResTable_config. The native getLocales function has
been changed to return well formed BCP-47 locales as
well, so that the corresponding java function can use
Locale.forLanguageTag to construct a Locale object
out of it.
Finally, this change introduces default and copy
constructors for ResTable_config to prevent having
to memset() the associated memory to 0 on every
stack allocation.
(cherry-picked from commit
91447d88f2bdf9c2bf8d1a53570efef6172fba74)
Change-Id: I1b43086860661012f949fb8e5deb7df44519b854
Narayan Kamath [Mon, 20 Jan 2014 13:57:11 +0000 (13:57 +0000)]
AssetManager support for 3 letter lang/country codes.
- 3 letter codes are packed into the existing 32 bit locale
field in ResTable_config
- We introduce new fields for script / variant information.
Note that we define a "match" between two ResTable_config
structures to be purely on the basis of their language &
country (disregarding the script and the variant). However,
configs with scripts and variants are considered to be more
specific than those without.
(cherry picked from commit
378c6775a62d9c461cde51f06c1b14bb014c78fd)
Change-Id: I7dce82a3fe2412834252723f458826ae41535a78
Narayan Kamath [Fri, 14 Feb 2014 13:23:46 +0000 (13:23 +0000)]
am
6795e9c7: am
7a66d8ea: am
3bec0fbb: am
fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class"
* commit '
6795e9c783242b31188d76c5186dfe0751f1731a':
AArch64: Use long for pointers in SurfaceSession class
Narayan Kamath [Fri, 14 Feb 2014 13:20:47 +0000 (13:20 +0000)]
am
7a66d8ea: am
3bec0fbb: am
fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class"
* commit '
7a66d8ea7caba75b03e5a75d234a8598e2d887c6':
AArch64: Use long for pointers in SurfaceSession class
Narayan Kamath [Fri, 14 Feb 2014 13:17:13 +0000 (13:17 +0000)]
am
3bec0fbb: am
fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class"
* commit '
3bec0fbb349a969934828ee726956877a3a21dee':
AArch64: Use long for pointers in SurfaceSession class
Narayan Kamath [Fri, 14 Feb 2014 13:14:07 +0000 (05:14 -0800)]
am
fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class"
* commit '
fa8f95e9b96e3a12e98269c8a31ed34df6a323ca':
AArch64: Use long for pointers in SurfaceSession class
Narayan Kamath [Fri, 14 Feb 2014 13:10:43 +0000 (13:10 +0000)]
Merge "AArch64: Use long for pointers in SurfaceSession class"
Jeff Brown [Fri, 14 Feb 2014 09:50:48 +0000 (09:50 +0000)]
am
f75aaf02: am
ae254a8d: am
3048191b: Remove onCreate() method that should not be there.
* commit '
f75aaf0282531f8e8448bfb1cbdfb239f683ae8b':
Remove onCreate() method that should not be there.
Jeff Brown [Fri, 14 Feb 2014 09:50:37 +0000 (09:50 +0000)]
am
ce0552f3: am
8a4c2bb1: am
567f7ca4: Refactor dream manager to new pattern.
* commit '
ce0552f360d8c8f0bc45095293be369800ce9c93':
Refactor dream manager to new pattern.
Jeff Brown [Fri, 14 Feb 2014 09:41:42 +0000 (09:41 +0000)]
am
ae254a8d: am
3048191b: Remove onCreate() method that should not be there.
* commit '
ae254a8d716b0515c5c91359a690987dfe8d5e9d':
Remove onCreate() method that should not be there.
Jeff Brown [Fri, 14 Feb 2014 09:41:38 +0000 (09:41 +0000)]
am
8a4c2bb1: am
567f7ca4: Refactor dream manager to new pattern.
* commit '
8a4c2bb1f07cf1d971290a7310d7b71aceb71590':
Refactor dream manager to new pattern.
Jeff Brown [Fri, 14 Feb 2014 09:14:15 +0000 (09:14 +0000)]
am
3048191b: Remove onCreate() method that should not be there.
* commit '
3048191b4cf9eff7a72b84065dec2b3dd1e89b3c':
Remove onCreate() method that should not be there.
Jeff Brown [Fri, 14 Feb 2014 09:14:09 +0000 (09:14 +0000)]
am
567f7ca4: Refactor dream manager to new pattern.
* commit '
567f7ca424280ae957b04d4f3df690055f2d41df':
Refactor dream manager to new pattern.
Jeff Brown [Fri, 14 Feb 2014 07:02:05 +0000 (23:02 -0800)]
Remove onCreate() method that should not be there.
Change-Id: I8355dd78f910afa9895d2fa00cb627a0885d9eec
Jeff Brown [Fri, 31 Jan 2014 07:38:03 +0000 (23:38 -0800)]
Refactor dream manager to new pattern.
Change-Id: I99ab4bd98d56a290368dc4b24e5bb24e0656b522
Adam Powell [Fri, 14 Feb 2014 03:21:54 +0000 (19:21 -0800)]
Fix build
Change-Id: Iec813bf820b4b5cb87949f4476d1b288c89c5f8a
Dianne Hackborn [Fri, 14 Feb 2014 02:03:48 +0000 (02:03 +0000)]
am
6231c948: am
dc3561df: am
01de2432: am
24d8fa73: Merge "frameworks/base: move idmap from frameworks/native"
* commit '
6231c948b0dc8dc97a5054f26c398a9a2884921f':
frameworks/base: move idmap from frameworks/native
Wink Saville [Fri, 14 Feb 2014 02:03:44 +0000 (02:03 +0000)]
am
df10f02a: am
e574f7de: am
ea56c795: am
bbba8211: Merge "Telephony: Handle DATA_CALL_LIST in DCC."
* commit '
df10f02a1428e12acda695360a5e760c8e806ea2':
Telephony: Handle DATA_CALL_LIST in DCC.
Dianne Hackborn [Fri, 14 Feb 2014 02:00:49 +0000 (02:00 +0000)]
am
dc3561df: am
01de2432: am
24d8fa73: Merge "frameworks/base: move idmap from frameworks/native"
* commit '
dc3561df118a17a099285c9be312fb66f91314ec':
frameworks/base: move idmap from frameworks/native
Wink Saville [Fri, 14 Feb 2014 02:00:46 +0000 (02:00 +0000)]
am
e574f7de: am
ea56c795: am
bbba8211: Merge "Telephony: Handle DATA_CALL_LIST in DCC."
* commit '
e574f7decf7bc2c6861aff2fd4458b9f96a08a28':
Telephony: Handle DATA_CALL_LIST in DCC.