OSDN Git Service
Shawn Willden [Thu, 19 Mar 2015 00:41:58 +0000 (00:41 +0000)]
am
254c58c4: Merge changes Id9a22ad3,I629ab2c4
* commit '
254c58c4e760e0af132d680fbd783a38ef436435':
Add KM_TAG_AUTH_TOKEN.
Add support for KM_TAG_USER_SECURE_ID.
Shawn Willden [Thu, 19 Mar 2015 00:27:37 +0000 (00:27 +0000)]
Merge changes Id9a22ad3,I629ab2c4
* changes:
Add KM_TAG_AUTH_TOKEN.
Add support for KM_TAG_USER_SECURE_ID.
Bryce Lee [Thu, 19 Mar 2015 00:21:13 +0000 (00:21 +0000)]
am
8bc23e82: Merge "Add Assist global action for wear to different from VOICE_ASSIST" into lmp-mr1-modular-dev
* commit '
8bc23e82af040334af4f2af1dae9898cc8c66df8':
Add Assist global action for wear to different from VOICE_ASSIST
Bryce Lee [Thu, 19 Mar 2015 00:14:06 +0000 (00:14 +0000)]
Merge "Add Assist global action for wear to different from VOICE_ASSIST" into lmp-mr1-modular-dev
Nick Vaccaro [Wed, 18 Mar 2015 23:44:20 +0000 (23:44 +0000)]
am
74a0eb36: Merge "Avoid unhandled page fault cases on Android Wear" into lmp-mr1-modular-dev
* commit '
74a0eb360da012c5a13577a8af33f6b28b0fadf7':
Avoid unhandled page fault cases on Android Wear
Nick Vaccaro [Wed, 18 Mar 2015 23:37:51 +0000 (23:37 +0000)]
Merge "Avoid unhandled page fault cases on Android Wear" into lmp-mr1-modular-dev
Mathieu Chartier [Wed, 18 Mar 2015 23:09:21 +0000 (23:09 +0000)]
am
437ac8f8: Merge "Add JIT late override property"
* commit '
437ac8f8445b078041171eff56ce7ffbd1cf6766':
Add JIT late override property
Mathieu Chartier [Wed, 18 Mar 2015 22:56:54 +0000 (22:56 +0000)]
Merge "Add JIT late override property"
Bart Sears [Wed, 18 Mar 2015 22:53:22 +0000 (22:53 +0000)]
am
91281bbd: resolved conflicts for merge of
cc86bc0c to lmp-mr1-modular-dev
* commit '
91281bbdde1d8bcec993ff61044a5aa4897f3175':
Prevent activities from being started during setup wizard.
Andreas Gampe [Wed, 18 Mar 2015 22:33:28 +0000 (22:33 +0000)]
am
13dbc3d4: Merge "Frameworks/base: Fix potential NPE in InputMethod"
* commit '
13dbc3d48d1c4ea8854f952f9ced4b7617ae5e87':
Frameworks/base: Fix potential NPE in InputMethod
Andreas Gampe [Wed, 18 Mar 2015 22:33:16 +0000 (22:33 +0000)]
am
9cc36ac2: Merge "Frameworks/base: Remove duplicate check in Mesh"
* commit '
9cc36ac2a2e07f81a9b11da7ff08e0da58b0143e':
Frameworks/base: Remove duplicate check in Mesh
Andreas Gampe [Wed, 18 Mar 2015 22:33:09 +0000 (22:33 +0000)]
am
2a247b36: Merge "Frameworks/base: Fix visibility flag in Editor"
* commit '
2a247b361089c0744202b604e22f9a79d239b92c':
Frameworks/base: Fix visibility flag in Editor
Andreas Gampe [Wed, 18 Mar 2015 22:33:01 +0000 (22:33 +0000)]
am
8df1bedc: Merge "Frameworks/base: Fix potential NPE in Script"
* commit '
8df1bedcba5bf146c49ba6b6a89e4f97c018045c':
Frameworks/base: Fix potential NPE in Script
Andreas Gampe [Wed, 18 Mar 2015 22:19:58 +0000 (22:19 +0000)]
Merge "Frameworks/base: Fix potential NPE in InputMethod"
Andreas Gampe [Wed, 18 Mar 2015 22:19:26 +0000 (22:19 +0000)]
Merge "Frameworks/base: Remove duplicate check in Mesh"
Andreas Gampe [Wed, 18 Mar 2015 22:19:07 +0000 (22:19 +0000)]
Merge "Frameworks/base: Fix visibility flag in Editor"
Mathieu Chartier [Tue, 17 Mar 2015 16:51:36 +0000 (09:51 -0700)]
Add JIT late override property
Required for JIT debug property since user builds can't restart
the shell.
Bug:
19735273
Change-Id: I1983852e80010c344b45e0bb459de47c56adfce8
Andreas Gampe [Wed, 18 Mar 2015 22:18:25 +0000 (22:18 +0000)]
Merge "Frameworks/base: Fix potential NPE in Script"
Bart Sears [Wed, 18 Mar 2015 21:12:10 +0000 (14:12 -0700)]
resolved conflicts for merge of
cc86bc0c to lmp-mr1-modular-dev
Change-Id: Ifb6c4ec5560c50a4bb91426734d7e05cd0c46e93
Bart Sears [Wed, 18 Mar 2015 20:28:59 +0000 (20:28 +0000)]
am
c2eb5c60: Merge "Prevent activities from being started during setup wizard." into lmp-mr1-dev
* commit '
c2eb5c602d36d91483c8f24b0c6859e4283724b4':
Prevent activities from being started during setup wizard.
Mark Salyzyn [Wed, 18 Mar 2015 20:25:54 +0000 (20:25 +0000)]
am
e2c8e504: Merge "logd: optimize statistics"
* commit '
e2c8e504d143c42c25d7e61a18f50cccb80f0c4d':
logd: optimize statistics
Bart Sears [Wed, 18 Mar 2015 20:21:57 +0000 (20:21 +0000)]
Merge "Prevent activities from being started during setup wizard." into lmp-mr1-dev
Mark Salyzyn [Wed, 18 Mar 2015 20:13:34 +0000 (20:13 +0000)]
Merge "logd: optimize statistics"
Jason Sams [Wed, 18 Mar 2015 19:57:44 +0000 (19:57 +0000)]
am
1aadd347: Merge "Avoid duplicate surface creation."
* commit '
1aadd3474177e6946ea0aae03f0628e436d0cf87':
Avoid duplicate surface creation.
Jason Sams [Wed, 18 Mar 2015 19:44:36 +0000 (19:44 +0000)]
Merge "Avoid duplicate surface creation."
Andreas Gampe [Wed, 18 Mar 2015 03:05:46 +0000 (20:05 -0700)]
Frameworks/base: Fix potential NPE in Script
Bug:
19797138
Change-Id: I5cd9394bd2c0f7c044c1f2f24665384fa797cd97
Dan Sandler [Wed, 18 Mar 2015 18:42:47 +0000 (18:42 +0000)]
am
fbd99e9f: am
76620791: am
b3a1b663: Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev
* commit '
fbd99e9fecea1cf467c082d2096cb1c3868685d4':
Avoid crashing on corrupted notifications.
Dan Sandler [Wed, 18 Mar 2015 18:35:20 +0000 (18:35 +0000)]
am
76620791: am
b3a1b663: Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev
* commit '
76620791600af3b3d6f6ad8ba3534320265153db':
Avoid crashing on corrupted notifications.
Dan Sandler [Wed, 18 Mar 2015 18:29:48 +0000 (18:29 +0000)]
am
b3a1b663: Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev
* commit '
b3a1b6632e403926fed995e851a8e44fc944c663':
Avoid crashing on corrupted notifications.
Rich Slogar [Wed, 18 Mar 2015 18:25:10 +0000 (18:25 +0000)]
am
1265575d: am
96693b29: am
8d3f587f: am
57c24fbb: am
2fc33a00: am
ddc44153: docs: downloads for sdk 24.1.2
* commit '
1265575d8a31f415606cccc39b24466ecae5731d':
docs: downloads for sdk 24.1.2
Geoff Mendal [Wed, 18 Mar 2015 18:23:51 +0000 (18:23 +0000)]
am
b48d3ce0: (-s ours) am
54064f66: (-s ours) Import translations. DO NOT MERGE
* commit '
b48d3ce076233a2da0b2146882c2e22a332fc665':
Import translations. DO NOT MERGE
Dong Zhou [Wed, 18 Mar 2015 18:23:45 +0000 (18:23 +0000)]
am
58ba39ed: am
94573dc5: am
89f41eb3: Define the capability to speed up MT call audio
* commit '
58ba39ed86798c3d0877e0ed6bdf09c74007c36f':
Define the capability to speed up MT call audio
Dan Sandler [Wed, 18 Mar 2015 18:23:19 +0000 (18:23 +0000)]
Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev
Kenny Root [Wed, 18 Mar 2015 18:20:30 +0000 (11:20 -0700)]
resolved conflicts for merge of
c3f497ae to lmp-mr1-dev-plus-aosp
Rich Slogar [Wed, 18 Mar 2015 17:41:28 +0000 (17:41 +0000)]
am
96693b29: am
8d3f587f: am
57c24fbb: am
2fc33a00: am
ddc44153: docs: downloads for sdk 24.1.2
* commit '
96693b29774713d156fd035cda174cfd7b4d9b65':
docs: downloads for sdk 24.1.2
Rich Slogar [Wed, 18 Mar 2015 17:35:46 +0000 (17:35 +0000)]
am
8d3f587f: am
57c24fbb: am
2fc33a00: am
ddc44153: docs: downloads for sdk 24.1.2
* commit '
8d3f587f15016d193e4739e3893b77e11336b498':
docs: downloads for sdk 24.1.2
Rich Slogar [Wed, 18 Mar 2015 17:27:29 +0000 (17:27 +0000)]
am
57c24fbb: am
2fc33a00: am
ddc44153: docs: downloads for sdk 24.1.2
* commit '
57c24fbb90dd7b342b06e2daecc1033f92d730da':
docs: downloads for sdk 24.1.2
Kenny Root [Wed, 18 Mar 2015 17:26:11 +0000 (10:26 -0700)]
resolved conflicts for merge of
fb9ff42d to lmp-mr1-dev-plus-aosp
Change-Id: Ifff03303c62aeba576974b877988b3a479945aa2
Rich Slogar [Wed, 18 Mar 2015 17:20:51 +0000 (17:20 +0000)]
am
2fc33a00: am
ddc44153: docs: downloads for sdk 24.1.2
* commit '
2fc33a008c02cf408e1d270972bbf681c7a36785':
docs: downloads for sdk 24.1.2
Rich Slogar [Wed, 18 Mar 2015 17:13:55 +0000 (17:13 +0000)]
am
ddc44153: docs: downloads for sdk 24.1.2
* commit '
ddc44153295174e8195286c21d7edcd3962b3661':
docs: downloads for sdk 24.1.2
Geoff Mendal [Wed, 18 Mar 2015 16:54:56 +0000 (16:54 +0000)]
am
54064f66: (-s ours) Import translations. DO NOT MERGE
* commit '
54064f66c949fa4069b4abb025c31afe28ac98ab':
Import translations. DO NOT MERGE
Dong Zhou [Wed, 18 Mar 2015 16:54:37 +0000 (16:54 +0000)]
am
94573dc5: am
89f41eb3: Define the capability to speed up MT call audio
* commit '
94573dc5515d69458effc92b66922f757adde4d0':
Define the capability to speed up MT call audio
Kenny Root [Wed, 18 Mar 2015 16:54:33 +0000 (16:54 +0000)]
am
4ff668d4: Track change to Conscrypt
* commit '
4ff668d47ab9f49ec81606aec6d469ecd6ca37fa':
Track change to Conscrypt
Kenny Root [Wed, 18 Mar 2015 16:54:29 +0000 (16:54 +0000)]
am
fbd8805c: Merge "Track change to Conscrypt" into lmp-mr1-ub-dev
* commit '
fbd8805cd783e34aebf521913aeab6cfd483b7b2':
Track change to Conscrypt
Geoff Mendal [Wed, 18 Mar 2015 15:43:02 +0000 (15:43 +0000)]
am
c0ca0de7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
c0ca0de76e2a8b72ecc4068fcf5dfbef519e7ca6':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Mar 2015 15:37:10 +0000 (15:37 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Wed, 18 Mar 2015 15:00:13 +0000 (08:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I20b86613eb30cf53d0a421068cb3a93e63750c9f
Auto-generated-cl: translation import
Geoff Mendal [Wed, 18 Mar 2015 13:04:44 +0000 (06:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifd3f512fcd1aabd685f10218eceda8f4f83bb116
Auto-generated-cl: translation import
Geoff Mendal [Wed, 18 Mar 2015 12:54:48 +0000 (12:54 +0000)]
am
8d889a67: (-s ours) Import translations. DO NOT MERGE
* commit '
8d889a67d079200fac0530542f48dd1d2fdedc4e':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Mar 2015 12:47:44 +0000 (05:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I046ce211561d45c3ee6b1763a7578d9ac54f3c90
Auto-generated-cl: translation import
Andreas Gampe [Wed, 18 Mar 2015 04:07:21 +0000 (21:07 -0700)]
Frameworks/base: Fix potential NPE in InputMethod
Don't read the size of an unchecked list.
Bug:
19797138
Change-Id: I9d8c087aff7bc9cc1e8aae9a0b489e23b5442765
Andreas Gampe [Wed, 18 Mar 2015 02:10:14 +0000 (19:10 -0700)]
Frameworks/base: Remove duplicate check in Mesh
Bug:
19797138
Change-Id: I0b11c4ff63a8031d5e58a06ac13f91ae0bbac5dc
Rich Slogar [Wed, 18 Mar 2015 00:19:07 +0000 (17:19 -0700)]
docs: downloads for sdk 24.1.2
b.android 160727
Change-Id: I112badc736ce4b85fabe0b702a2b24800ee589bd
Jason Sams [Tue, 17 Mar 2015 23:36:55 +0000 (16:36 -0700)]
Avoid duplicate surface creation.
Change-Id: I43104c8b48dd26681735940e6b2e1ba902af2020
Andreas Gampe [Tue, 17 Mar 2015 23:08:43 +0000 (16:08 -0700)]
Frameworks/base: Fix visibility flag in Editor
Fix double check.
Bug:
19797138
Change-Id: I95e694f384f1f25d6cf3b6a1669052940385e41d
Dong Zhou [Tue, 17 Mar 2015 22:28:22 +0000 (22:28 +0000)]
am
89f41eb3: Define the capability to speed up MT call audio
* commit '
89f41eb39e910e220957ac861651ead17eff9085':
Define the capability to speed up MT call audio
Kenny Root [Wed, 26 Nov 2014 17:08:40 +0000 (09:08 -0800)]
Track change to Conscrypt
(cherry picked from commit
9d2d6b6b4b1b16221cbd857703cd6301c6bf873c)
Bug:
19798387
Change-Id: I8814fd0720acf09332927f184fdd9b2cdac4f413
Kenny Root [Tue, 17 Mar 2015 22:21:52 +0000 (22:21 +0000)]
Merge "Track change to Conscrypt" into lmp-mr1-ub-dev
Dong Zhou [Sun, 15 Mar 2015 16:59:49 +0000 (11:59 -0500)]
Define the capability to speed up MT call audio
Bug:
19656525
Change-Id: I0bc88e85b807871b2883a785efac91bd0e1f6d8d
Andreas Gampe [Tue, 17 Mar 2015 21:43:01 +0000 (21:43 +0000)]
am
28e6aeca: Merge "Frameworks/base: Make IDENTITY_MATRIX final"
* commit '
28e6aeca3aad075ef4fd7aab08cd1ad1ff9eb555':
Frameworks/base: Make IDENTITY_MATRIX final
Andreas Gampe [Tue, 17 Mar 2015 21:42:55 +0000 (21:42 +0000)]
am
9568772a: Merge "Frameworks/base: Fix format string in Geofence"
* commit '
9568772acbf5b36f2edb41f7c5b06d499329add0':
Frameworks/base: Fix format string in Geofence
Andreas Gampe [Tue, 17 Mar 2015 21:33:08 +0000 (21:33 +0000)]
Merge "Frameworks/base: Make IDENTITY_MATRIX final"
Andreas Gampe [Mon, 16 Mar 2015 01:55:33 +0000 (18:55 -0700)]
Frameworks/base: Make IDENTITY_MATRIX final
Bug:
19797138
Change-Id: I127f24b7060a0c4dab401ce8e3057d362c6d6b06
Andreas Gampe [Tue, 17 Mar 2015 21:30:49 +0000 (21:30 +0000)]
Merge "Frameworks/base: Fix format string in Geofence"
Andreas Gampe [Sun, 15 Mar 2015 21:49:15 +0000 (14:49 -0700)]
Frameworks/base: Fix format string in Geofence
%p is not a valid conversion in format strings. It is also superfluous,
as it is already known that location is null.
Bug:
19797138
Change-Id: I5784e28b05b4ca9aac57e0fc9da4a7f01d9b3247
Kenny Root [Fri, 31 Oct 2014 17:28:04 +0000 (10:28 -0700)]
Track change to Conscrypt
Change way in which an outside caller can get the preferred SSLContext.
(cherry picked from commit
8a970637208207955fb6a719bd82902384b3c743)
Bug:
19798387
Bug:
17136008
Change-Id: Ide578664bcb605304322bfddd2e640a63042fa09
Andreas Gampe [Tue, 17 Mar 2015 21:05:48 +0000 (21:05 +0000)]
am
aae42eb2: Merge "Frameworks/base: Fix format string in Camera"
* commit '
aae42eb26176482b09f0846e6acf7efa844a0d23':
Frameworks/base: Fix format string in Camera
Andreas Gampe [Tue, 17 Mar 2015 20:52:20 +0000 (20:52 +0000)]
Merge "Frameworks/base: Fix format string in Camera"
Andreas Gampe [Sun, 15 Mar 2015 21:43:31 +0000 (14:43 -0700)]
Frameworks/base: Fix format string in Camera
One cannot print a boolean with %d. That will result in an exception.
Bug:
19797138
Change-Id: I86c42ea834cebebaecff8463637cc9de14d1fc88
Andreas Gampe [Tue, 17 Mar 2015 20:49:18 +0000 (20:49 +0000)]
am
be549f9b: Merge "Frameworks/base: Fix precedence bug"
* commit '
be549f9b8e01f884a2cc2d668457c6b1c12ff4cc':
Frameworks/base: Fix precedence bug
Filip Gruszczynski [Tue, 17 Mar 2015 20:44:58 +0000 (20:44 +0000)]
am
7bd2feda: Merge "Add animation to zeroing burn in protection." into lmp-mr1-modular-dev
* commit '
7bd2feda9e146c90c8720d8aa213ebcd9c30430c':
Add animation to zeroing burn in protection.
Andreas Gampe [Tue, 17 Mar 2015 20:41:04 +0000 (20:41 +0000)]
am
0ae488e1: Merge "Frameworks/base: Use || instead of |"
* commit '
0ae488e1cb64318906397a40d8be4866e81e4860':
Frameworks/base: Use || instead of |
Andreas Gampe [Tue, 17 Mar 2015 20:40:58 +0000 (20:40 +0000)]
am
4d907643: Merge "Frameworks/base: Fix trivial equals implementation"
* commit '
4d9076437c0270cd863493f505e734a3108e89ea':
Frameworks/base: Fix trivial equals implementation
Filip Gruszczynski [Tue, 17 Mar 2015 20:38:30 +0000 (20:38 +0000)]
Merge "Add animation to zeroing burn in protection." into lmp-mr1-modular-dev
Andreas Gampe [Tue, 17 Mar 2015 20:36:21 +0000 (20:36 +0000)]
Merge "Frameworks/base: Fix precedence bug"
Andreas Gampe [Sun, 15 Mar 2015 20:59:50 +0000 (13:59 -0700)]
Frameworks/base: Fix precedence bug
Explicit cast has higher precedence than shift.
Bug:
19797138
Change-Id: Ifcf569bf774fbf65ee50c078f736ad167bcc6b8c
Andreas Gampe [Tue, 17 Mar 2015 20:28:52 +0000 (20:28 +0000)]
Merge "Frameworks/base: Use || instead of |"
Andreas Gampe [Mon, 16 Mar 2015 03:32:22 +0000 (20:32 -0700)]
Frameworks/base: Use || instead of |
Nothing wrong with | in this case, but || is canonical.
Bug:
19797138
Change-Id: I5f145736a5470f7cde06efce9a217d86eda2135f
Andreas Gampe [Tue, 17 Mar 2015 20:25:20 +0000 (20:25 +0000)]
Merge "Frameworks/base: Fix trivial equals implementation"
Andreas Gampe [Sun, 15 Mar 2015 22:21:25 +0000 (15:21 -0700)]
Frameworks/base: Fix trivial equals implementation
The comparator's equal implementation doesn't satisfy the constraints
of an equals method, namely being reflexive. Use the standard Object
implementation instead.
Bug:
19797138
Change-Id: I74f888e99533e1945aab7ab10fe8ee3ded6388f4
Brian Carlstrom [Tue, 17 Mar 2015 19:44:55 +0000 (19:44 +0000)]
am
d8507e3a: am
83419118: am
97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev
* commit '
d8507e3aa4c8b05f753cd9541014c391891c1f75':
Update vmSafeMode documentation
Brian Carlstrom [Tue, 17 Mar 2015 19:36:19 +0000 (19:36 +0000)]
am
83419118: am
97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev
* commit '
83419118e3c72311ef6b900457d1b03fd5c77883':
Update vmSafeMode documentation
Brian Carlstrom [Tue, 17 Mar 2015 19:29:20 +0000 (19:29 +0000)]
am
97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev
* commit '
97f3cd0a8280b2cf08069cc1e2d89d8bb227633f':
Update vmSafeMode documentation
Brian Carlstrom [Tue, 17 Mar 2015 19:22:45 +0000 (19:22 +0000)]
Merge "Update vmSafeMode documentation" into lmp-mr1-dev
Filip Gruszczynski [Tue, 17 Mar 2015 18:35:17 +0000 (18:35 +0000)]
am
86318d76: Merge "Option for going home when going to sleep for devices without physical button." into lmp-mr1-modular-dev
* commit '
86318d768a2c5043e1261e9daacf1497d1e4a732':
Option for going home when going to sleep for devices without physical button.
Filip Gruszczynski [Mon, 16 Mar 2015 21:47:32 +0000 (14:47 -0700)]
Add animation to zeroing burn in protection.
Also don't shift immediately after starting ambient mode, but wait until
the first update.
Bug:
19521822
Change-Id: Id0b267d0f30e4533195dcfadbed726db0866e4db
Filip Gruszczynski [Tue, 17 Mar 2015 18:29:29 +0000 (18:29 +0000)]
Merge "Option for going home when going to sleep for devices without physical button." into lmp-mr1-modular-dev
Dan Sandler [Wed, 25 Feb 2015 18:20:39 +0000 (13:20 -0500)]
Avoid crashing on corrupted notifications.
If a notification content view has an @id/icon or
@id/right_icon, we need to make sure those ImageViews
actually have a drawable inside.
Bug:
19487078
Change-Id: I4ef6c4a10926823aa8680628097ed150d9e717d4
Deepanshu Gupta [Tue, 17 Mar 2015 14:44:52 +0000 (14:44 +0000)]
am
576801ff: am
842eee9f: am
1f9a26af: am
158c08bc: am
ada85905: Fix AppCompat action bar theming.
* commit '
576801ff82a85c4de19404dfe364eef7184b84e0':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:44:46 +0000 (14:44 +0000)]
am
a5be9a7d: am
38467b5f: am
9a00f1c8: am
79f7fce7: am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
a5be9a7d2d2cbcd3892fc916c9a944745024881d':
Fix NoActionBar themes rendering.
Mathieu Chartier [Tue, 17 Mar 2015 14:36:50 +0000 (14:36 +0000)]
am
008ec61e: Merge "Change jit properties to be debug properties"
* commit '
008ec61e0ccff0ca92cc0d2b5b73a1d620d3aad3':
Change jit properties to be debug properties
Deepanshu Gupta [Tue, 17 Mar 2015 14:36:05 +0000 (14:36 +0000)]
am
842eee9f: am
1f9a26af: am
158c08bc: am
ada85905: Fix AppCompat action bar theming.
* commit '
842eee9f816a2e35bf3c9ce6c14cd5e43684265b':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:35:58 +0000 (14:35 +0000)]
am
38467b5f: am
9a00f1c8: am
79f7fce7: am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
38467b5fbbc09ad05624454f735d27ada25565c8':
Fix NoActionBar themes rendering.
Deepanshu Gupta [Tue, 17 Mar 2015 14:28:37 +0000 (14:28 +0000)]
am
1f9a26af: am
158c08bc: am
ada85905: Fix AppCompat action bar theming.
* commit '
1f9a26af95abba385b612c734d1d5e32d9e3f363':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:28:33 +0000 (14:28 +0000)]
am
9a00f1c8: am
79f7fce7: am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
9a00f1c84b7a7936a12415a08604ac8fb98ec5ea':
Fix NoActionBar themes rendering.
Deepanshu Gupta [Tue, 17 Mar 2015 14:16:50 +0000 (14:16 +0000)]
am
158c08bc: am
ada85905: Fix AppCompat action bar theming.
* commit '
158c08bcf1cd0bc702748ee2a4cf6aa259c26147':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:16:42 +0000 (14:16 +0000)]
am
79f7fce7: am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
79f7fce7a49e7b7cd414ff5c3fdb5cbaae45c1f1':
Fix NoActionBar themes rendering.
Mathieu Chartier [Tue, 17 Mar 2015 02:04:33 +0000 (02:04 +0000)]
Merge "Change jit properties to be debug properties"
Andreas Gampe [Tue, 17 Mar 2015 00:25:04 +0000 (00:25 +0000)]
am
345a8f69: Merge "Frameworks/base: Fix a comparison"
* commit '
345a8f69ea2acd6d3ecf4c200cb33e8037f8798c':
Frameworks/base: Fix a comparison
Deepanshu Gupta [Tue, 17 Mar 2015 00:21:02 +0000 (00:21 +0000)]
am
ada85905: Fix AppCompat action bar theming.
* commit '
ada8590547348b77d8cbd56abdb8fadb3e72c015':
Fix AppCompat action bar theming.