OSDN Git Service
Michael Jurka [Wed, 21 Nov 2012 19:57:18 +0000 (11:57 -0800)]
am
367f0678: am
ce552e91: Merge "Fix janky transition on All Apps tab switch" into jb-mr1.1-dev
* commit '
367f06788005a8200959a1f4a50be04378fb335e':
Fix janky transition on All Apps tab switch
Michael Jurka [Wed, 21 Nov 2012 19:56:13 +0000 (11:56 -0800)]
am
ce552e91: Merge "Fix janky transition on All Apps tab switch" into jb-mr1.1-dev
* commit '
ce552e91962bb343ef8cf074e2714aac2d5e710d':
Fix janky transition on All Apps tab switch
Michael Jurka [Wed, 21 Nov 2012 19:53:38 +0000 (11:53 -0800)]
Merge "Fix janky transition on All Apps tab switch" into jb-mr1.1-dev
Michael Jurka [Tue, 20 Nov 2012 00:15:24 +0000 (16:15 -0800)]
Fix janky transition on All Apps tab switch
Bug:
7139562
Adam Cohen [Mon, 19 Nov 2012 23:54:33 +0000 (15:54 -0800)]
am
8372a638: am
2ee5fe77: Merge "Refactoring push reordering (issue
7139335)" into jb-mr1.1-dev
* commit '
8372a63897a8b2b5d73fafb5e9185d80312a69c8':
Refactoring push reordering (issue
7139335)
Adam Cohen [Mon, 19 Nov 2012 23:51:21 +0000 (15:51 -0800)]
am
2ee5fe77: Merge "Refactoring push reordering (issue
7139335)" into jb-mr1.1-dev
* commit '
2ee5fe77db4f3269f538272231de24786c112f1d':
Refactoring push reordering (issue
7139335)
Adam Cohen [Mon, 19 Nov 2012 23:49:23 +0000 (15:49 -0800)]
Merge "Refactoring push reordering (issue
7139335)" into jb-mr1.1-dev
Adam Cohen [Sat, 17 Nov 2012 02:28:11 +0000 (18:28 -0800)]
Refactoring push reordering (issue
7139335)
-> This new approach is actually correct in emulating cascaded pushing of
items left, right, up and down.
-> Takes care of a couple crashes and some instances where reordering
was not doing the right thing.
Change-Id: I016120e62f5d6fa1a2a6289c3badcb6ec230b2a3
Michael Jurka [Mon, 19 Nov 2012 23:28:03 +0000 (15:28 -0800)]
am
cdedd061: am
0a457bfb: Fix StrictMode violation
* commit '
cdedd0615c4ad9c71aa03cb9840d6d1e3dcfeba6':
Fix StrictMode violation
Michael Jurka [Mon, 19 Nov 2012 23:25:30 +0000 (15:25 -0800)]
am
0a457bfb: Fix StrictMode violation
* commit '
0a457bfbd9ca6562e8fcd604bcdfeb22f1fb4ded':
Fix StrictMode violation
Michael Jurka [Mon, 19 Nov 2012 22:05:05 +0000 (14:05 -0800)]
Fix StrictMode violation
Switching how we set a property to tell launcher
to force rotation to be enabled, or to dump state.
Bug:
7538629
Change-Id: I8cb55f1a28ba59fe5d410562c66bc86eb9efabfe
Michael Jurka [Sat, 17 Nov 2012 02:30:29 +0000 (18:30 -0800)]
Michael Jurka [Sat, 17 Nov 2012 02:27:26 +0000 (18:27 -0800)]
Michael Jurka [Sat, 17 Nov 2012 02:21:22 +0000 (18:21 -0800)]
Craig Mautner [Sat, 17 Nov 2012 00:42:23 +0000 (16:42 -0800)]
am
1ba5a207: am
360310b7: Extend background to full screen.
* commit '
1ba5a20709d84308c29a5164640d82ce2956d89a':
Extend background to full screen.
Craig Mautner [Sat, 17 Nov 2012 00:40:30 +0000 (16:40 -0800)]
am
360310b7: Extend background to full screen.
* commit '
360310b74de10d7bd2cc0a2ab874b1d246a6a7ba':
Extend background to full screen.
Craig Mautner [Fri, 26 Oct 2012 22:13:08 +0000 (15:13 -0700)]
Extend background to full screen.
Gradient and black backgrounds were stopping at the Status Bar.
When returning from a full screen app to the launcher the wallpaper
was completely visible when it should have been obscured by these
backgrounds. Making the app full screen while keeping the views
within the system insets fixes this.
Bug
7410717 fixed.
Change-Id: If3f7e4808961ee6c80fe2d0a328e6ca39fa5eb7a
Michael Jurka [Fri, 16 Nov 2012 21:15:38 +0000 (13:15 -0800)]
am
6c8d6123: am
3c42e118: Merge "Cleaning up unused code" into jb-mr1.1-dev
* commit '
6c8d6123ba22c8bd523cfaf46196385cb79290ee':
Cleaning up unused code
Michael Jurka [Fri, 16 Nov 2012 21:13:34 +0000 (13:13 -0800)]
am
3c42e118: Merge "Cleaning up unused code" into jb-mr1.1-dev
* commit '
3c42e118c4c78f0b7f71e27ce0232bdc105842f0':
Cleaning up unused code
Michael Jurka [Fri, 16 Nov 2012 21:10:49 +0000 (13:10 -0800)]
Merge "Cleaning up unused code" into jb-mr1.1-dev
Michael Jurka [Thu, 15 Nov 2012 22:11:41 +0000 (14:11 -0800)]
Cleaning up unused code
The Android Open Source Project [Wed, 14 Nov 2012 20:41:25 +0000 (12:41 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I2bf1cf80a9166d9d8d574f811a6ea60f498b0f05
The Android Automerger [Wed, 14 Nov 2012 19:28:52 +0000 (11:28 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Michael Jurka [Wed, 14 Nov 2012 00:19:00 +0000 (16:19 -0800)]
am
0da0b480: am
9df38dff: Updating wallpaper picker icon to higher res
* commit '
0da0b4801b3a03be0fe139223d7831ab5c5ea02c':
Updating wallpaper picker icon to higher res
Michael Jurka [Wed, 14 Nov 2012 00:17:26 +0000 (16:17 -0800)]
am
9df38dff: Updating wallpaper picker icon to higher res
* commit '
9df38dff2df1c58c890deaf9484b81e356fe1a8b':
Updating wallpaper picker icon to higher res
Michael Jurka [Tue, 13 Nov 2012 02:07:02 +0000 (18:07 -0800)]
Updating wallpaper picker icon to higher res
Bug:
7400295
Change-Id: I2c7625ee1ce09ded57d884c229f155ebcf39be07
The Android Open Source Project [Mon, 12 Nov 2012 15:31:12 +0000 (07:31 -0800)]
am
5ab56553: am
f8fbfd9f: Reconcile with jb-mr1-release - do not merge
* commit '
5ab5655343591baa8b315f8f0513112a1798d389':
The Android Open Source Project [Mon, 12 Nov 2012 15:28:32 +0000 (07:28 -0800)]
am
f8fbfd9f: Reconcile with jb-mr1-release - do not merge
* commit '
f8fbfd9fcfc311c66c37d3e63e1feb01726e0b4f':
The Android Open Source Project [Mon, 12 Nov 2012 15:26:33 +0000 (07:26 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Icf259b354e115d0514bb0d6c33beffddb4bbcf35
Baligh Uddin [Sat, 10 Nov 2012 06:45:14 +0000 (22:45 -0800)]
am
803b2acb: am
8ef7f717: am
7774041f: Import translations. DO NOT MERGE
* commit '
803b2acb8ff92cf295a42423d266d4122e9c496e':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 10 Nov 2012 06:41:46 +0000 (22:41 -0800)]
am
8ef7f717: am
7774041f: Import translations. DO NOT MERGE
* commit '
8ef7f717c59d95e2124dbeaf250fe76452085dfc':
Import translations. DO NOT MERGE
The Android Automerger [Sat, 10 Nov 2012 00:25:42 +0000 (16:25 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Baligh Uddin [Fri, 9 Nov 2012 23:24:55 +0000 (15:24 -0800)]
am
7774041f: Import translations. DO NOT MERGE
* commit '
7774041f7707456427127f36a9c69400f92f8570':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 9 Nov 2012 23:17:00 +0000 (15:17 -0800)]
am
65f120d9: Import translations. DO NOT MERGE
* commit '
65f120d9ed8bb80bbd9b7c971400e95861b6d8aa':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 9 Nov 2012 15:06:12 +0000 (07:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia8f60a9599833d4eccc6f332af67b4a71ba12a51
Auto-generated-cl: translation import
Baligh Uddin [Fri, 9 Nov 2012 15:05:50 +0000 (07:05 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia2fb515cb9d652162c5760ed936b3ca93a41580b
Auto-generated-cl: translation import
The Android Open Source Project [Tue, 6 Nov 2012 20:37:53 +0000 (12:37 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I883abd23470b18df68c30b9307393b9b89ed0061
The Android Open Source Project [Tue, 6 Nov 2012 20:29:54 +0000 (12:29 -0800)]
am
c6102390: am
209cdc3b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
c6102390c6f2f7228326913e4d2e7598fbdd596a':
The Android Open Source Project [Tue, 6 Nov 2012 20:23:57 +0000 (12:23 -0800)]
am
209cdc3b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
209cdc3b7ac92efb6427910916d04fb93083bcfa':
Cap launcher swipe animations to max duration
Workaround for generating QSB icon press states. (Bug
7132477)
Adding more debug code for dup. ItemInfo bug
Temporary fix for qsb and hotseat clicking issues
The Android Open Source Project [Tue, 6 Nov 2012 20:18:27 +0000 (12:18 -0800)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Ia95ceb234c77dafcedb79274226f4bd279c63c79
The Android Automerger [Tue, 6 Nov 2012 10:28:13 +0000 (02:28 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Tue, 6 Nov 2012 02:39:08 +0000 (18:39 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Baligh Uddin [Mon, 5 Nov 2012 22:15:13 +0000 (14:15 -0800)]
am
8713e74c: am
c36184a8: Import translations. DO NOT MERGE
* commit '
8713e74c71cbfdf9e62f4b6c496496a6207e33ce':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 5 Nov 2012 22:11:51 +0000 (14:11 -0800)]
am
c36184a8: Import translations. DO NOT MERGE
* commit '
c36184a884d817bec9d9eb1e89bdbedea329ff95':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 2 Nov 2012 14:33:04 +0000 (07:33 -0700)]
am
69e48cb6: Import translations. DO NOT MERGE
* commit '
69e48cb609298c1a845d7991a185a0e073bb3777':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 2 Nov 2012 05:19:51 +0000 (22:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia8ddaa0b2fb9877eb3e6d2f761f66f756065ae2d
Auto-generated-cl: translation import
Baligh Uddin [Fri, 2 Nov 2012 05:19:23 +0000 (22:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2b74f9ba01c2705d6b9d2573f23657d6f6fc00f2
Auto-generated-cl: translation import
The Android Open Source Project [Thu, 1 Nov 2012 14:52:31 +0000 (07:52 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I65f1a13c4c6203332e2184e5625dde8cc4cbb8f6
The Android Automerger [Thu, 1 Nov 2012 01:34:17 +0000 (18:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Baligh Uddin [Wed, 31 Oct 2012 22:06:25 +0000 (15:06 -0700)]
am
4ea79638: am
e8f40508: Import translations. DO NOT MERGE
* commit '
4ea79638378a523fa2d920d875cd00dabb19094b':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 31 Oct 2012 22:03:12 +0000 (15:03 -0700)]
am
e8f40508: Import translations. DO NOT MERGE
* commit '
e8f40508cc1f6d3b19e290dda1375cd41e4a3501':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 31 Oct 2012 16:44:34 +0000 (09:44 -0700)]
am
22583be7: Import translations. DO NOT MERGE
* commit '
22583be7671afec5f8cc6761c4e522c45c65d563':
Import translations. DO NOT MERGE
The Android Open Source Project [Wed, 31 Oct 2012 16:18:18 +0000 (09:18 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I6a2777a25426e69caf568c39823597c86aaa1c61
Baligh Uddin [Wed, 31 Oct 2012 00:39:44 +0000 (17:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1fcec61bfde318f1dca85130a25d0bb75491d8ab
Auto-generated-cl: translation import
Baligh Uddin [Wed, 31 Oct 2012 00:39:00 +0000 (17:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I93115a7871c1e56b05419628cdaa76f7f9f74ce5
Auto-generated-cl: translation import
The Android Automerger [Tue, 30 Oct 2012 15:52:58 +0000 (08:52 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Chet Haase [Mon, 29 Oct 2012 21:38:57 +0000 (14:38 -0700)]
am
2f1ac9eb: am
36095e86: Merge "Stop animating All Apps during transition to Home" into jb-mr1-dev
* commit '
2f1ac9eb1f8a8cc3dae70cee1b540250f8a3d3ff':
Stop animating All Apps during transition to Home
Chet Haase [Mon, 29 Oct 2012 21:35:07 +0000 (14:35 -0700)]
am
36095e86: Merge "Stop animating All Apps during transition to Home" into jb-mr1-dev
* commit '
36095e861b8aba1069cf1e28c89de8f3f299114a':
Stop animating All Apps during transition to Home
Chet Haase [Mon, 29 Oct 2012 21:24:08 +0000 (14:24 -0700)]
Merge "Stop animating All Apps during transition to Home" into jb-mr1-dev
Chet Haase [Sat, 27 Oct 2012 00:59:53 +0000 (17:59 -0700)]
Stop animating All Apps during transition to Home
One of the sources of jank in launcher is during the All Apps -> Home
transition. specifically, if the user has started a fling operation (where
we are animating between pages in All Apps) and then hits the Home button,
we continue the fling animation while also doing the transition to Home
scale/fade animations. This causes a lot of work for launcher, particularly because
the fling animation is causing the All Apps layer to get recreated on every frame.
The fix is to simply pause the fling animation, then snap to its end state when the
animation to Home is complete. We also need to pause/snap the scroll indicator animation,
because it's fading animation causes the same layer-recreation jank that the fling
itself causes.
Issue #
7387124 Home <-> All Apps transition animation is janky while flinging
Change-Id: Icbcaf2d5b3b2f6ce8fd7419419d258248aa1475b
Chet Haase [Thu, 25 Oct 2012 23:01:11 +0000 (16:01 -0700)]
Cap launcher swipe animations to max duration
large screens take too long swiping between screens. Cap the duration to
some max value to make things snappier.
Change-Id: Iee967c1b00b4962a0490fd0e20d48d7d8363dd2f
Dave Burke [Fri, 26 Oct 2012 00:22:57 +0000 (17:22 -0700)]
am
8ad55ae3: am
e57e793b: Merge "Cap launcher swipe animations to max duration" into jb-mr1-dev
* commit '
8ad55ae371508e03d41bba57651bec5f9c389a80':
Cap launcher swipe animations to max duration
Dave Burke [Fri, 26 Oct 2012 00:20:53 +0000 (17:20 -0700)]
am
e57e793b: Merge "Cap launcher swipe animations to max duration" into jb-mr1-dev
* commit '
e57e793bbdc6c51ba13481f82ff17a2f3e6910c5':
Cap launcher swipe animations to max duration
Dave Burke [Fri, 26 Oct 2012 00:19:09 +0000 (17:19 -0700)]
Merge "Cap launcher swipe animations to max duration" into jb-mr1-dev
Chet Haase [Thu, 25 Oct 2012 23:01:11 +0000 (16:01 -0700)]
Cap launcher swipe animations to max duration
large screens take too long swiping between screens. Cap the duration to
some max value to make things snappier.
Change-Id: Iee967c1b00b4962a0490fd0e20d48d7d8363dd2f
The Android Automerger [Thu, 25 Oct 2012 20:42:38 +0000 (13:42 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Dave Burke [Thu, 25 Oct 2012 20:15:27 +0000 (13:15 -0700)]
am
84864bdd: am
8634f849: Merge "Delay ACTION_MAIN processing when not focused." into jb-mr1-dev
* commit '
84864bdd7084a5f10103995abf358c9ab67a19b3':
Delay ACTION_MAIN processing when not focused.
Dave Burke [Thu, 25 Oct 2012 20:13:28 +0000 (13:13 -0700)]
am
8634f849: Merge "Delay ACTION_MAIN processing when not focused." into jb-mr1-dev
* commit '
8634f8494a0260b75a82f82e8d4a7985030d04c8':
Delay ACTION_MAIN processing when not focused.
Dave Burke [Thu, 25 Oct 2012 20:10:55 +0000 (13:10 -0700)]
Merge "Delay ACTION_MAIN processing when not focused." into jb-mr1-dev
Chet Haase [Thu, 25 Oct 2012 19:25:48 +0000 (12:25 -0700)]
am
a3ae83e6: am
853e2a7a: Merge "Resize wallpaper assets to avoid runtime resizing" into jb-mr1-dev
* commit '
a3ae83e66823ba06eb614e5dcf76e9ef6f757272':
Resize wallpaper assets to avoid runtime resizing
Chet Haase [Thu, 25 Oct 2012 19:23:10 +0000 (12:23 -0700)]
am
853e2a7a: Merge "Resize wallpaper assets to avoid runtime resizing" into jb-mr1-dev
* commit '
853e2a7ac308b3d66740a79e72f9e28b8f27f9c8':
Resize wallpaper assets to avoid runtime resizing
Chet Haase [Thu, 25 Oct 2012 19:20:08 +0000 (12:20 -0700)]
Merge "Resize wallpaper assets to avoid runtime resizing" into jb-mr1-dev
Chet Haase [Thu, 25 Oct 2012 00:25:42 +0000 (17:25 -0700)]
Resize wallpaper assets to avoid runtime resizing
Issue #
7352961 Wallpaper edge is cut-off while scrolling through home page
Change-Id: I4bed3d4445fdcc2e2effd846f074bf7ef6dd532a
Jamie Gennis [Tue, 23 Oct 2012 22:44:26 +0000 (15:44 -0700)]
Delay ACTION_MAIN processing when not focused.
This change puts a 350 ms delay before processing the ACTION_MAIN intent when
the window is not focused. This makes the Launcher animation take place after
the GPU-intensive portion of the window shade hide animation, resulting in
smoother animations.
Bug:
7401764
Change-Id: I574f2ba398fcf38b423413f802673bbd4d983cd2
The Android Automerger [Tue, 23 Oct 2012 13:59:44 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Michael Jurka [Tue, 23 Oct 2012 00:12:32 +0000 (17:12 -0700)]
am
0acc2041: am
9dc882be: Merge "Get rid of explicit GC requests" into jb-mr1-dev
* commit '
0acc2041a6d2b73358adbf34735e309977a26bdb':
Get rid of explicit GC requests
Michael Jurka [Tue, 23 Oct 2012 00:10:02 +0000 (17:10 -0700)]
am
9dc882be: Merge "Get rid of explicit GC requests" into jb-mr1-dev
* commit '
9dc882be0f9cfa21f2f73b1bd4c9d75612ac5bfc':
Get rid of explicit GC requests
Michael Jurka [Tue, 23 Oct 2012 00:08:15 +0000 (17:08 -0700)]
Merge "Get rid of explicit GC requests" into jb-mr1-dev
The Android Automerger [Mon, 22 Oct 2012 23:42:24 +0000 (16:42 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Baligh Uddin [Mon, 22 Oct 2012 17:11:04 +0000 (10:11 -0700)]
am
acc0f2ee: am
ee451392: Import translations. DO NOT MERGE
* commit '
acc0f2eef4cf7a0f7bbf5899e22bbe99ad74348d':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Oct 2012 17:08:24 +0000 (10:08 -0700)]
am
303f2f16: Import translations. DO NOT MERGE
* commit '
303f2f162130b6efe74108976abff61e78c77206':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Oct 2012 17:08:21 +0000 (10:08 -0700)]
am
ee451392: Import translations. DO NOT MERGE
* commit '
ee4513920446ace2bc2659e3315f5b648ec1e313':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Oct 2012 15:28:57 +0000 (08:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibc8c1dcd857312d4d6df39c18cc32708dfcaea80
Auto-generated-cl: translation import
Baligh Uddin [Mon, 22 Oct 2012 15:28:19 +0000 (08:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I58a38555e9f6f568297c4c188f0a04311eaaabe8
Auto-generated-cl: translation import
The Android Automerger [Fri, 19 Oct 2012 22:46:26 +0000 (15:46 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Svetoslav Ganov [Fri, 19 Oct 2012 21:27:51 +0000 (14:27 -0700)]
am
40d172c1: am
303f621e: Merge "Send correctly populated Accessibility event on Launcher state change." into jb-mr1-dev
* commit '
40d172c1b5ba885797a7f9ea7aa4488e8721ea83':
Send correctly populated Accessibility event on Launcher state change.
Svetoslav Ganov [Fri, 19 Oct 2012 21:25:14 +0000 (14:25 -0700)]
am
303f621e: Merge "Send correctly populated Accessibility event on Launcher state change." into jb-mr1-dev
* commit '
303f621e574e69d46e207530737e279ed42d9c43':
Send correctly populated Accessibility event on Launcher state change.
Svetoslav Ganov [Fri, 19 Oct 2012 21:22:44 +0000 (14:22 -0700)]
Merge "Send correctly populated Accessibility event on Launcher state change." into jb-mr1-dev
Adam Cohen [Fri, 19 Oct 2012 17:49:28 +0000 (10:49 -0700)]
am
2a11598a: am
381fe4ce: Adding width / height to cling text style
* commit '
2a11598a4ab2a67876ee7fb8d5b0f313311e4cb7':
Adding width / height to cling text style
Adam Cohen [Fri, 19 Oct 2012 17:46:43 +0000 (10:46 -0700)]
am
381fe4ce: Adding width / height to cling text style
* commit '
381fe4ce6fb465253c8e9bc42c2836f0c40e6231':
Adding width / height to cling text style
Adam Cohen [Fri, 19 Oct 2012 17:17:18 +0000 (10:17 -0700)]
Adding width / height to cling text style
Change-Id: Ia39b049fe414edf926c221baed3b1223199ce2a7
Baligh Uddin [Fri, 19 Oct 2012 16:16:19 +0000 (09:16 -0700)]
am
e6401ece: am
5b449dc3: Merge "Bring dummy cling strings back as \'strings\'" into jb-mr1-dev
* commit '
e6401ece8a3502b9ad4329a572b596175676f1d0':
Bring dummy cling strings back as 'strings'
Baligh Uddin [Fri, 19 Oct 2012 16:13:55 +0000 (09:13 -0700)]
am
5b449dc3: Merge "Bring dummy cling strings back as \'strings\'" into jb-mr1-dev
* commit '
5b449dc3095192fecd4760d9f550de65e588e3dc':
Bring dummy cling strings back as 'strings'
Michael Jurka [Fri, 19 Oct 2012 16:11:18 +0000 (09:11 -0700)]
am
d5bc834f: am
964e2a63: Merge "Fix NPE" into jb-mr1-dev
* commit '
d5bc834f413d08c6c9db89b0d27e636361661d51':
Fix NPE
Michael Jurka [Fri, 19 Oct 2012 16:11:17 +0000 (09:11 -0700)]
Baligh Uddin [Fri, 19 Oct 2012 16:11:12 +0000 (09:11 -0700)]
Merge "Bring dummy cling strings back as 'strings'" into jb-mr1-dev
Michael Jurka [Fri, 19 Oct 2012 16:08:58 +0000 (09:08 -0700)]
am
964e2a63: Merge "Fix NPE" into jb-mr1-dev
* commit '
964e2a63c29ed81c2dbd82a3386fda2af7d4662c':
Fix NPE
Michael Jurka [Fri, 19 Oct 2012 16:08:57 +0000 (09:08 -0700)]
Michael Jurka [Fri, 19 Oct 2012 16:07:01 +0000 (09:07 -0700)]
Merge "Fix NPE" into jb-mr1-dev
Michael Jurka [Fri, 19 Oct 2012 15:32:24 +0000 (17:32 +0200)]
Fix NPE
Bug:
7356682
Change-Id: Ic6522da1ec6ac0d57f1565cef9c43949f2d7fd70