OSDN Git Service
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 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
Michael Jurka [Fri, 19 Oct 2012 15:22:00 +0000 (17:22 +0200)]
Get rid of explicit GC requests
Bug:
7370913
Michael Jurka [Fri, 19 Oct 2012 15:15:16 +0000 (17:15 +0200)]
The Android Automerger [Fri, 19 Oct 2012 13:59:57 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Scott Main [Thu, 18 Oct 2012 21:44:21 +0000 (14:44 -0700)]
am
08c2f804: am
4cd7f281: remove old fashioned dream, no longer supported
* commit '
08c2f8048f02eac6269a2f81ef3e1b6d23444b14':
remove old fashioned dream, no longer supported
Scott Main [Thu, 18 Oct 2012 21:41:40 +0000 (14:41 -0700)]
am
4cd7f281: remove old fashioned dream, no longer supported
* commit '
4cd7f281056740cc22eccd156c34b98b5816d370':
remove old fashioned dream, no longer supported
Scott Main [Thu, 18 Oct 2012 19:10:03 +0000 (12:10 -0700)]
remove old fashioned dream, no longer supported
Change-Id: I87370e8dc7f3159182dac9f650223ce010d6286b
Baligh Uddin [Thu, 18 Oct 2012 17:31:09 +0000 (10:31 -0700)]
Bring dummy cling strings back as 'strings'
The translations import recognizes 'string', 'string-array' and
'plurals' as valid items to parse, all others are ignored. This is the
reason, why these strings have not been imported back into the codebase.
Making the string declaration same as when it was removed in cl/236665
Change-Id: I6d53ba9d6267706834cb66e9ca99a1335aa01d14
Bug:
7203884
The Android Automerger [Wed, 17 Oct 2012 23:07:36 +0000 (16:07 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
alanv [Wed, 17 Oct 2012 20:15:47 +0000 (13:15 -0700)]
Send correctly populated Accessibility event on Launcher state change.
Bug:
7362253
Change-Id: I72811292e8091a21866cb4599d37a71eb475b1d5
Romain Guy [Wed, 17 Oct 2012 19:46:44 +0000 (12:46 -0700)]
am
181a0b22: am
e34a213c: Add missing layout attributes Bug #
7334849
* commit '
181a0b22fbaeded3e33d09cd625fbee812a66fec':
Add missing layout attributes Bug #
7334849
Romain Guy [Wed, 17 Oct 2012 19:44:14 +0000 (12:44 -0700)]
am
e34a213c: Add missing layout attributes Bug #
7334849
* commit '
e34a213c32d54c525fc1c4b6f79e449446435484':
Add missing layout attributes Bug #
7334849
Romain Guy [Wed, 17 Oct 2012 19:04:05 +0000 (12:04 -0700)]
Add missing layout attributes
Bug #
7334849
Change-Id: Iae01cf5c587716951dee849e9c4116717d137d8f
The Android Automerger [Mon, 15 Oct 2012 19:31:18 +0000 (12:31 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Open Source Project [Mon, 15 Oct 2012 14:40:11 +0000 (07:40 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I204c53690f99803900e6613188a6d9a14370e007
The Android Automerger [Mon, 15 Oct 2012 13:59:38 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jason Chen [Mon, 15 Oct 2012 06:08:00 +0000 (23:08 -0700)]
Jason Chen [Mon, 15 Oct 2012 06:04:42 +0000 (23:04 -0700)]
Jason Chen [Fri, 12 Oct 2012 17:47:11 +0000 (10:47 -0700)]
Let's enhance
Add mipmap-* launcher icon assets. Removes equivalent icons from
drawable directories and fixes up the reference to them in a layout.
Bug:
6718166
Change-Id: Ic97e3208d0b47523c8fabef949b2b06825e2fa8f
The Android Automerger [Fri, 12 Oct 2012 17:27:16 +0000 (10:27 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Open Source Project [Fri, 12 Oct 2012 14:32:00 +0000 (07:32 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: If20e289cd34c19f80f7c2ad19587d19483a7700f
Romain Guy [Fri, 12 Oct 2012 00:11:14 +0000 (17:11 -0700)]
am
cc69ee77: am
0d06152d: Merge "Remove unnecessary allocations during draw Bug #
7327799" into jb-mr1-dev
* commit '
cc69ee77b0a96baa75499c1a116d8cbbfce7422f':
Remove unnecessary allocations during draw Bug #
7327799
The Android Automerger [Thu, 11 Oct 2012 23:26:53 +0000 (16:26 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Romain Guy [Thu, 11 Oct 2012 18:12:57 +0000 (11:12 -0700)]
am
0d06152d: Merge "Remove unnecessary allocations during draw Bug #
7327799" into jb-mr1-dev
* commit '
0d06152d4026e933d8308002e1d53ca4eba6cad2':
Remove unnecessary allocations during draw Bug #
7327799
Romain Guy [Thu, 11 Oct 2012 18:10:47 +0000 (11:10 -0700)]
Merge "Remove unnecessary allocations during draw Bug #
7327799" into jb-mr1-dev
Michael Jurka [Thu, 11 Oct 2012 15:26:07 +0000 (08:26 -0700)]
am
80d64c28: am
dfe0c293: Merge "Add entries for string resources that appear in clings" into jb-mr1-dev
* commit '
80d64c28f45e0378e05021dc9222982b3d67150e':
Add entries for string resources that appear in clings
Michael Jurka [Thu, 11 Oct 2012 15:24:57 +0000 (08:24 -0700)]
am
dfe0c293: Merge "Add entries for string resources that appear in clings" into jb-mr1-dev
* commit '
dfe0c29383049b269094a51fd74e693a8cb9b5b0':
Add entries for string resources that appear in clings
Michael Jurka [Thu, 11 Oct 2012 15:23:09 +0000 (08:23 -0700)]
Merge "Add entries for string resources that appear in clings" into jb-mr1-dev
The Android Automerger [Thu, 11 Oct 2012 15:19:41 +0000 (08:19 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Open Source Project [Thu, 11 Oct 2012 15:05:52 +0000 (08:05 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ice7d89d927b01c03db60deaa0f00840df514ee96
The Android Automerger [Thu, 11 Oct 2012 14:04:12 +0000 (07:04 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Open Source Project [Thu, 11 Oct 2012 12:57:54 +0000 (05:57 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Idf9e1ad5fe56ee4d56e5266630b6f971ecba10c7
Michael Jurka [Thu, 11 Oct 2012 09:00:37 +0000 (11:00 +0200)]
Add entries for string resources that appear in clings
Baligh Uddin [Thu, 11 Oct 2012 04:18:36 +0000 (21:18 -0700)]
am
61854931: am
260eb9c6: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
* commit '
61854931252710cedbb596918dee6524723d1223':
Revert "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 11 Oct 2012 04:16:59 +0000 (21:16 -0700)]
am
ae5a2a4a: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev
* commit '
ae5a2a4a4ef055fc0403b2cefa860b29ae88c998':
Revert "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 11 Oct 2012 04:16:54 +0000 (21:16 -0700)]
am
260eb9c6: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
* commit '
260eb9c6ff598d792b51e5c24608602a1f5b1504':
Revert "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 11 Oct 2012 04:14:57 +0000 (21:14 -0700)]
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev
Baligh Uddin [Thu, 11 Oct 2012 04:14:47 +0000 (21:14 -0700)]
Revert "Import translations. DO NOT MERGE"
broken build
This reverts commit
4caeee6e08317abaf70b52e1a8b6b8a9e6300a7f
Change-Id: Ie3456538cf40d34ca9d1121cc523f968f2c3a9e2
Baligh Uddin [Thu, 11 Oct 2012 04:14:37 +0000 (21:14 -0700)]
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
OSDN Git Service
