git.osdn.net Git - android-x86/packages-apps-Launcher3.git/log

Dmitry Kalita [Wed, 16 Mar 2016 18:59:22 +0000 (18:59 +0000)]

Merge "Fix restoring of layer type"
am: 0b28b42

* commit '0b28b42c0f2d94777b517c7f270956240978e4dd':
Fix restoring of layer type

commit | commitdiff | tree

Sunny Goyal [Wed, 16 Mar 2016 17:19:49 +0000 (17:19 +0000)]

Merge "Fix restoring of layer type"

commit | commitdiff | tree

Dmitry Kalita [Tue, 26 Jan 2016 17:30:34 +0000 (19:30 +0200)]

Fix restoring of layer type

Change-Id: I1233b846247b270644325c0ad0229a23bfb29040
Signed-off-by: Dmitry Kalita <rusmonster@gmail.com>

commit | commitdiff | tree

Ritesh Reddy [Tue, 22 Dec 2015 19:10:08 +0000 (19:10 +0000)]

Stopped closing state file descriptors after use

The oldState and newState ParcelFileDescriptors and
their file streams should not be closed after use
as they are reused by the BackupHelper's invoker.

Change-Id: I737fce7153168a52ff2818d682d81f3ee6f37369

commit | commitdiff | tree

Sunny Goyal [Fri, 23 Oct 2015 19:41:46 +0000 (19:41 +0000)]

Merge "Update the Launcher3 backup.proto to use the deprecated nano package." am: 54076676a5 am: 1cebcca996
am: 135e8cb721

* commit '135e8cb721efee9d828fc98044a9340cc354b3a4':
Update the Launcher3 backup.proto to use the deprecated nano package.

commit | commitdiff | tree

Sunny Goyal [Fri, 23 Oct 2015 19:38:33 +0000 (19:38 +0000)]

Merge "Update the Launcher3 backup.proto to use the deprecated nano package." am: 54076676a5
am: 1cebcca996

* commit '1cebcca996cf6e3e583dec8aa970091c8f4f75f0':
Update the Launcher3 backup.proto to use the deprecated nano package.

commit | commitdiff | tree

Sunny Goyal [Fri, 23 Oct 2015 19:34:14 +0000 (19:34 +0000)]

Merge "Update the Launcher3 backup.proto to use the deprecated nano package."
am: 54076676a5

* commit '54076676a516d87a265196715a0f3b35da751067':
Update the Launcher3 backup.proto to use the deprecated nano package.

commit | commitdiff | tree

Sunny Goyal [Fri, 23 Oct 2015 19:28:50 +0000 (19:28 +0000)]

Merge "Update the Launcher3 backup.proto to use the deprecated nano package."

commit | commitdiff | tree

Daniel Weis [Fri, 23 Oct 2015 02:31:20 +0000 (19:31 -0700)]

Update the Launcher3 backup.proto to use the deprecated nano package.

This fixes the build breakage that will be caused by
I0b930811a3a8240c236d3708d51f11bc04241593

Change-Id: Ie824b04fdaa80ebfa0ba1f0675cf08ede134be12

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:30:43 +0000 (03:30 +0000)]

Import translations. DO NOT MERGE am: 2c29ac6eb5  -s ours am: b58e5fbc57  -s ours am: 2aa01afb35  -s ours am: 25c42a0937  -s ours am: a34c8cc2ba  -s ours am: 446b98f4e4  -s ours am: 90022fd4c9  -s ours am: 2473783bbd  -s ours am: 14ac721939  -s ours am: f630789246  -s ours
am: 04ad7785a7  -s ours

* commit '04ad7785a7738fef4874525308a29eb55a793a2b':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:30:39 +0000 (03:30 +0000)]

am 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT MERGE am: 35424cc2a6  -s ours am: 8a901a6133  -s ours am: 6cf8795a68  -s ours am: 2d714406cd  -s ours am: ed94b5520d  -s ours am: 3e1c84ad8c  -s ours am: 4c6f47c15e  -s ours am: f4dd532c3e  -s ours am: 9c26a98ebf  -s ours am: 9d5a25ea2b  -s ours
am: 0ef0c8e5c8  -s ours

* commit '0ef0c8e5c89479b02a98c57df44416d7b0bc7d5b':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:30:35 +0000 (03:30 +0000)]

Import translations. DO NOT MERGE am: c81b0617a6  -s ours am: 431d174f26  -s ours am: 8eef658cf9  -s ours am: 1e6e698881  -s ours am: cfb6dac38f  -s ours am: 5168f039b3  -s ours am: 83e41764c1  -s ours am: e0342fad73  -s ours am: 10873a6d78  -s ours am: 57f4c5caec  -s ours
am: 6c9c94c595  -s ours

* commit '6c9c94c5959355a75821b4f253d420339fe6f874':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:30:31 +0000 (03:30 +0000)]

Import translations. DO NOT MERGE am: 81403969d1  -s ours am: bbe424e584  -s ours am: 5b53a47d02  -s ours am: 9b7386403a  -s ours am: 994502244e  -s ours am: 2573cb9c33  -s ours am: 1e52e4df04  -s ours am: 0df33c9132  -s ours am: 83e8ec10d8  -s ours am: aa2a2eaa00  -s ours
am: e4fcefcd44  -s ours

* commit 'e4fcefcd446f756f903ef8a2d904777ea2dd4ed3':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:30:28 +0000 (03:30 +0000)]

Import translations. DO NOT MERGE am: 01614d6ba5  -s ours am: 8454595cf3  -s ours am: 3f3f0fbc02  -s ours am: 2693dd2cd9  -s ours am: 1edcac1745  -s ours am: dc4f328c4d  -s ours am: 7cdd35ca3c  -s ours am: 03612b0a04  -s ours am: 188a1c0d1a  -s ours am: 4164d8a8dc  -s ours
am: 07b3422a48  -s ours

* commit '07b3422a481a3ea8283f50364facac4e9d24c152':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:30:24 +0000 (03:30 +0000)]

Import translations. DO NOT MERGE am: c4d66cf035  -s ours am: 3209b2bc4d  -s ours am: 69830841ec  -s ours am: 4baaf3241f  -s ours am: 5148e0d456  -s ours am: 21abe0d9f7  -s ours am: 9c2588976f  -s ours am: d487fcd435  -s ours am: f072358f7e  -s ours am: 3c069c2f34  -s ours
am: e3be94b883  -s ours

* commit 'e3be94b88300c768159547909491a930388cf713':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:30:20 +0000 (03:30 +0000)]

am ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658 am: 7fd445f4cc am: 5d6886a1cf am: 38bd557502 am: 0442deaee7 am: 5793b647fd am: f351d2d274 am: cf067a9a44 am: 4d31a0b5f1 am: 4075264811 am: fe90966e40
am: f8482775ab

* commit 'f8482775ab06f7f7431f2723421b09c096bd4bbb':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 03:30:16 +0000 (03:30 +0000)]

am e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 149268d869 am: 70aa099f23 am: eadf9b6782 am: 24483f0498 am: a107ef6e13 am: f7f8df9f7c am: 94fd0e00d1 am: 12a5698507 am: b8b5e8d796 am: d1ae932f74
am: 736c9f40d2

* commit '736c9f40d25dd2123e36561d6399c2bdb0b50184':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 03:30:13 +0000 (03:30 +0000)]

am 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: b1a081221e am: 1bd8f7e460 am: 7661d33379 am: 7e5ec74df0 am: 84138b1523 am: e90e2b89bb am: 26e7cd5b94 am: 29adb8de49 am: 76494fd9a0 am: b38a6a864a
am: 7f5957cddd

* commit '7f5957cddd59add2ed48f84a46415be3c64ea3c0':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 03:30:09 +0000 (03:30 +0000)]

am 49635c71: am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: fb1a32a63d am: 27b99c86e9 am: 078afac399 am: 94b7ee378f am: 6b7a1631f6 am: 753cf130b9 am: bbf5c27346 am: 63251de093 am: 18cd7c97b8 am: ccbed080dd
am: 9581d43bf1

* commit '9581d43bf1a1aa12170fb05d7fe33d3dbbe7cc18':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 03:30:05 +0000 (03:30 +0000)]

am a4d0ef3c: am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 64b83ce632 am: 346da07c80 am: 78a44d4726 am: 8abc959461 am: 6060c10580 am: 9d494757cf am: daf82e6d8c am: d8b2144af4 am: 387a4ffab2 am: fb449aa7a1
am: d7758f309e

* commit 'd7758f309eb36cd8ed7ecfee2e0fa234d871be50':

commit | commitdiff | tree

Mathew Inwood [Tue, 20 Oct 2015 03:30:01 +0000 (03:30 +0000)]

am 48e725bd: am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d5da3cc1d8 am: 7748c94d25 am: 4396cc1fff am: a267cb6dde am: f289060a04 am: 3b678d2e58 am: e147ed8705 am: 83163c5011 am: fa4fbc1653 am: 4d97fef5f7
am: 5c15f15431

* commit '5c15f154313e55eee162836bc73f4c9567a7014c':

commit | commitdiff | tree

Juan Silveira [Tue, 20 Oct 2015 03:29:58 +0000 (03:29 +0000)]

am 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 524ed6adda am: 3f39cc45d8 am: 6120e6096a am: d9ba2b56db am: 8dc63a93c6 am: b897ea777e am: f5e5e1270d am: eaccb5a5b4 am: e3ee81540c am: 0a7d61f5e3
am: 2cc2701717

* commit '2cc27017178a24ddcf573dc7430032a8a82a3b08':

commit | commitdiff | tree

Anton Hansson [Tue, 20 Oct 2015 03:29:54 +0000 (03:29 +0000)]

am 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 0274f0a568 am: cb168d34ae am: 616facd74b am: 4c5dbc52b3 am: ed0c3623a9 am: bf4e852f95 am: 5c02e22455 am: 982cbc361c am: b8ec169116 am: 70b9ea23ea
am: 514720e86b

* commit '514720e86b47c903acf47154ad5b2507a9bd6509':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 03:29:50 +0000 (03:29 +0000)]

am b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 5cc929caa0 am: 5c597e4aba am: 1dda00996a am: b523cc1e4f am: 622880c0b9 am: 65f484b1fc am: 7c811ecaaf am: 9c0a25b58c am: 983daa1abc am: cbe3d95513
am: 98beed36bb

* commit '98beed36bb4c0c813aabdf24e5b9a9dc0964346b':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:29:47 +0000 (03:29 +0000)]

keep history after reset to ub-now-lunchbox-release@1069658 am: 2b8dbe3a5f am: 319e21ec62 am: ce566c0e93 am: 1c30b578e1 am: 9fa7ca7d65 am: dcc908e147 -s ours am: af265461f1 am: 9d06c95c57 am: 292c2f7174 am: 6f1ea9e555
am: 3e52f9b020

* commit '3e52f9b020e14f3aecf5c9ea71f767de7470a7f6':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:28:51 +0000 (03:28 +0000)]

Import translations. DO NOT MERGE am: 2c29ac6eb5  -s ours am: b58e5fbc57  -s ours am: 2aa01afb35  -s ours am: 25c42a0937  -s ours am: a34c8cc2ba  -s ours am: 446b98f4e4  -s ours am: 90022fd4c9  -s ours am: 2473783bbd  -s ours am: 14ac721939  -s ours
am: f630789246  -s ours

* commit 'f630789246e5782b05d5f4035d72ffe256e7abae':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:28:47 +0000 (03:28 +0000)]

am 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT MERGE am: 35424cc2a6  -s ours am: 8a901a6133  -s ours am: 6cf8795a68  -s ours am: 2d714406cd  -s ours am: ed94b5520d  -s ours am: 3e1c84ad8c  -s ours am: 4c6f47c15e  -s ours am: f4dd532c3e  -s ours am: 9c26a98ebf  -s ours
am: 9d5a25ea2b  -s ours

* commit '9d5a25ea2b3a1421f984366e76f96e893347f7fe':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:28:43 +0000 (03:28 +0000)]

Import translations. DO NOT MERGE am: c81b0617a6  -s ours am: 431d174f26  -s ours am: 8eef658cf9  -s ours am: 1e6e698881  -s ours am: cfb6dac38f  -s ours am: 5168f039b3  -s ours am: 83e41764c1  -s ours am: e0342fad73  -s ours am: 10873a6d78  -s ours
am: 57f4c5caec  -s ours

* commit '57f4c5caec1195fb9aed5085009733c8f6f43245':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:28:39 +0000 (03:28 +0000)]

Import translations. DO NOT MERGE am: 81403969d1  -s ours am: bbe424e584  -s ours am: 5b53a47d02  -s ours am: 9b7386403a  -s ours am: 994502244e  -s ours am: 2573cb9c33  -s ours am: 1e52e4df04  -s ours am: 0df33c9132  -s ours am: 83e8ec10d8  -s ours
am: aa2a2eaa00  -s ours

* commit 'aa2a2eaa00bf130bef1e1d77a84079215bc88605':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:28:36 +0000 (03:28 +0000)]

Import translations. DO NOT MERGE am: 01614d6ba5  -s ours am: 8454595cf3  -s ours am: 3f3f0fbc02  -s ours am: 2693dd2cd9  -s ours am: 1edcac1745  -s ours am: dc4f328c4d  -s ours am: 7cdd35ca3c  -s ours am: 03612b0a04  -s ours am: 188a1c0d1a  -s ours
am: 4164d8a8dc  -s ours

* commit '4164d8a8dc8542a37fed4e818c47bb3e749f460a':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:28:32 +0000 (03:28 +0000)]

Import translations. DO NOT MERGE am: c4d66cf035  -s ours am: 3209b2bc4d  -s ours am: 69830841ec  -s ours am: 4baaf3241f  -s ours am: 5148e0d456  -s ours am: 21abe0d9f7  -s ours am: 9c2588976f  -s ours am: d487fcd435  -s ours am: f072358f7e  -s ours
am: 3c069c2f34  -s ours

* commit '3c069c2f340ad02fabdc93eabf5c5dbb4aca22d1':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:28:28 +0000 (03:28 +0000)]

am ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658 am: 7fd445f4cc am: 5d6886a1cf am: 38bd557502 am: 0442deaee7 am: 5793b647fd am: f351d2d274 am: cf067a9a44 am: 4d31a0b5f1 am: 4075264811
am: fe90966e40

* commit 'fe90966e409204eba248ebf9dd7561b7556c51fe':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 03:28:25 +0000 (03:28 +0000)]

am e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 149268d869 am: 70aa099f23 am: eadf9b6782 am: 24483f0498 am: a107ef6e13 am: f7f8df9f7c am: 94fd0e00d1 am: 12a5698507 am: b8b5e8d796
am: d1ae932f74

* commit 'd1ae932f741c543be89fc7cff8cf1a803132ecde':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 03:28:21 +0000 (03:28 +0000)]

am 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: b1a081221e am: 1bd8f7e460 am: 7661d33379 am: 7e5ec74df0 am: 84138b1523 am: e90e2b89bb am: 26e7cd5b94 am: 29adb8de49 am: 76494fd9a0
am: b38a6a864a

* commit 'b38a6a864a5050c7dbac9836c58a5bdb106b8339':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 03:28:17 +0000 (03:28 +0000)]

am 49635c71: am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: fb1a32a63d am: 27b99c86e9 am: 078afac399 am: 94b7ee378f am: 6b7a1631f6 am: 753cf130b9 am: bbf5c27346 am: 63251de093 am: 18cd7c97b8
am: ccbed080dd

* commit 'ccbed080dddb7bf5095cb4b8de6b9dc75e0c1f61':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 03:28:14 +0000 (03:28 +0000)]

am a4d0ef3c: am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 64b83ce632 am: 346da07c80 am: 78a44d4726 am: 8abc959461 am: 6060c10580 am: 9d494757cf am: daf82e6d8c am: d8b2144af4 am: 387a4ffab2
am: fb449aa7a1

* commit 'fb449aa7a1eb6fad4e17d9875629077eb81c5609':

commit | commitdiff | tree

Mathew Inwood [Tue, 20 Oct 2015 03:28:10 +0000 (03:28 +0000)]

am 48e725bd: am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d5da3cc1d8 am: 7748c94d25 am: 4396cc1fff am: a267cb6dde am: f289060a04 am: 3b678d2e58 am: e147ed8705 am: 83163c5011 am: fa4fbc1653
am: 4d97fef5f7

* commit '4d97fef5f735d10acb47168115f22e7a4d3efa1c':

commit | commitdiff | tree

Juan Silveira [Tue, 20 Oct 2015 03:28:06 +0000 (03:28 +0000)]

am 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 524ed6adda am: 3f39cc45d8 am: 6120e6096a am: d9ba2b56db am: 8dc63a93c6 am: b897ea777e am: f5e5e1270d am: eaccb5a5b4 am: e3ee81540c
am: 0a7d61f5e3

* commit '0a7d61f5e3d62f42b06b0da736cc9dd60dadd579':

commit | commitdiff | tree

Anton Hansson [Tue, 20 Oct 2015 03:28:03 +0000 (03:28 +0000)]

am 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 0274f0a568 am: cb168d34ae am: 616facd74b am: 4c5dbc52b3 am: ed0c3623a9 am: bf4e852f95 am: 5c02e22455 am: 982cbc361c am: b8ec169116
am: 70b9ea23ea

* commit '70b9ea23ea609ea4d442c70dcd002233262274f3':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 03:27:59 +0000 (03:27 +0000)]

am b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 5cc929caa0 am: 5c597e4aba am: 1dda00996a am: b523cc1e4f am: 622880c0b9 am: 65f484b1fc am: 7c811ecaaf am: 9c0a25b58c am: 983daa1abc
am: cbe3d95513

* commit 'cbe3d95513a19cb2966e760db329afed5953c4b8':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:27:56 +0000 (03:27 +0000)]

keep history after reset to ub-now-lunchbox-release@1069658 am: 2b8dbe3a5f am: 319e21ec62 am: ce566c0e93 am: 1c30b578e1 am: 9fa7ca7d65 am: dcc908e147 -s ours am: af265461f1 am: 9d06c95c57 am: 292c2f7174
am: 6f1ea9e555

* commit '6f1ea9e5553e43d72598382b3d594119702bdde7':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:26:44 +0000 (03:26 +0000)]

Import translations. DO NOT MERGE am: 2c29ac6eb5  -s ours am: b58e5fbc57  -s ours am: 2aa01afb35  -s ours am: 25c42a0937  -s ours am: a34c8cc2ba  -s ours am: 446b98f4e4  -s ours am: 90022fd4c9  -s ours am: 2473783bbd  -s ours
am: 14ac721939  -s ours

* commit '14ac721939d769f15a4a605955c533197b2ac627':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:26:40 +0000 (03:26 +0000)]

am 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT MERGE am: 35424cc2a6  -s ours am: 8a901a6133  -s ours am: 6cf8795a68  -s ours am: 2d714406cd  -s ours am: ed94b5520d  -s ours am: 3e1c84ad8c  -s ours am: 4c6f47c15e  -s ours am: f4dd532c3e  -s ours
am: 9c26a98ebf  -s ours

* commit '9c26a98ebf6052cd37c90a5abeb1df8d23158905':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:26:36 +0000 (03:26 +0000)]

Import translations. DO NOT MERGE am: c81b0617a6  -s ours am: 431d174f26  -s ours am: 8eef658cf9  -s ours am: 1e6e698881  -s ours am: cfb6dac38f  -s ours am: 5168f039b3  -s ours am: 83e41764c1  -s ours am: e0342fad73  -s ours
am: 10873a6d78  -s ours

* commit '10873a6d7828c8204b0397198c6e5d4c0d044ed1':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:26:33 +0000 (03:26 +0000)]

Import translations. DO NOT MERGE am: 81403969d1  -s ours am: bbe424e584  -s ours am: 5b53a47d02  -s ours am: 9b7386403a  -s ours am: 994502244e  -s ours am: 2573cb9c33  -s ours am: 1e52e4df04  -s ours am: 0df33c9132  -s ours
am: 83e8ec10d8  -s ours

* commit '83e8ec10d830e3d6d3ebe6b7a4dda7b25c0a4a6d':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:26:29 +0000 (03:26 +0000)]

Import translations. DO NOT MERGE am: 01614d6ba5  -s ours am: 8454595cf3  -s ours am: 3f3f0fbc02  -s ours am: 2693dd2cd9  -s ours am: 1edcac1745  -s ours am: dc4f328c4d  -s ours am: 7cdd35ca3c  -s ours am: 03612b0a04  -s ours
am: 188a1c0d1a  -s ours

* commit '188a1c0d1a545254e190e2fc6e09a77f54db1a4f':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:26:26 +0000 (03:26 +0000)]

Import translations. DO NOT MERGE am: c4d66cf035  -s ours am: 3209b2bc4d  -s ours am: 69830841ec  -s ours am: 4baaf3241f  -s ours am: 5148e0d456  -s ours am: 21abe0d9f7  -s ours am: 9c2588976f  -s ours am: d487fcd435  -s ours
am: f072358f7e  -s ours

* commit 'f072358f7ed09e032e908564f636472e4af1e3be':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:26:22 +0000 (03:26 +0000)]

am ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658 am: 7fd445f4cc am: 5d6886a1cf am: 38bd557502 am: 0442deaee7 am: 5793b647fd am: f351d2d274 am: cf067a9a44 am: 4d31a0b5f1
am: 4075264811

* commit '4075264811ee4118662cc39c0895cb6647fb75f8':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 03:26:18 +0000 (03:26 +0000)]

am e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 149268d869 am: 70aa099f23 am: eadf9b6782 am: 24483f0498 am: a107ef6e13 am: f7f8df9f7c am: 94fd0e00d1 am: 12a5698507
am: b8b5e8d796

* commit 'b8b5e8d7967e4f69a64b952e08d489cef0cf51dc':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 03:26:15 +0000 (03:26 +0000)]

am 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: b1a081221e am: 1bd8f7e460 am: 7661d33379 am: 7e5ec74df0 am: 84138b1523 am: e90e2b89bb am: 26e7cd5b94 am: 29adb8de49
am: 76494fd9a0

* commit '76494fd9a0e146bc2045c8ed2bc92290ac6a5b64':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 03:26:11 +0000 (03:26 +0000)]

am 49635c71: am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: fb1a32a63d am: 27b99c86e9 am: 078afac399 am: 94b7ee378f am: 6b7a1631f6 am: 753cf130b9 am: bbf5c27346 am: 63251de093
am: 18cd7c97b8

* commit '18cd7c97b8ca5abc1462c015c08d6f8fc1736382':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 03:26:07 +0000 (03:26 +0000)]

am a4d0ef3c: am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 64b83ce632 am: 346da07c80 am: 78a44d4726 am: 8abc959461 am: 6060c10580 am: 9d494757cf am: daf82e6d8c am: d8b2144af4
am: 387a4ffab2

* commit '387a4ffab269f252708c3c1a9017b29a10e422b8':

commit | commitdiff | tree

Mathew Inwood [Tue, 20 Oct 2015 03:26:04 +0000 (03:26 +0000)]

am 48e725bd: am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d5da3cc1d8 am: 7748c94d25 am: 4396cc1fff am: a267cb6dde am: f289060a04 am: 3b678d2e58 am: e147ed8705 am: 83163c5011
am: fa4fbc1653

* commit 'fa4fbc1653b46c7a33e82672b6fdaced0993faa8':

commit | commitdiff | tree

Juan Silveira [Tue, 20 Oct 2015 03:26:00 +0000 (03:26 +0000)]

am 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 524ed6adda am: 3f39cc45d8 am: 6120e6096a am: d9ba2b56db am: 8dc63a93c6 am: b897ea777e am: f5e5e1270d am: eaccb5a5b4
am: e3ee81540c

* commit 'e3ee81540cc0cf77a4c92395433049edd340d5d6':

commit | commitdiff | tree

Anton Hansson [Tue, 20 Oct 2015 03:25:57 +0000 (03:25 +0000)]

am 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 0274f0a568 am: cb168d34ae am: 616facd74b am: 4c5dbc52b3 am: ed0c3623a9 am: bf4e852f95 am: 5c02e22455 am: 982cbc361c
am: b8ec169116

* commit 'b8ec169116e9fff236ff17bb515ebd076f0dbb64':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 03:25:53 +0000 (03:25 +0000)]

am b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 5cc929caa0 am: 5c597e4aba am: 1dda00996a am: b523cc1e4f am: 622880c0b9 am: 65f484b1fc am: 7c811ecaaf am: 9c0a25b58c
am: 983daa1abc

* commit '983daa1abc163de0258ee8a0aad133dfe7ec4b5e':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:25:50 +0000 (03:25 +0000)]

keep history after reset to ub-now-lunchbox-release@1069658 am: 2b8dbe3a5f am: 319e21ec62 am: ce566c0e93 am: 1c30b578e1 am: 9fa7ca7d65 am: dcc908e147 -s ours am: af265461f1 am: 9d06c95c57
am: 292c2f7174

* commit '292c2f71744350048a9a1ddea96bb4e12b6a1d03':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:24:41 +0000 (03:24 +0000)]

Import translations. DO NOT MERGE am: 2c29ac6eb5  -s ours am: b58e5fbc57  -s ours am: 2aa01afb35  -s ours am: 25c42a0937  -s ours am: a34c8cc2ba  -s ours am: 446b98f4e4  -s ours am: 90022fd4c9  -s ours
am: 2473783bbd  -s ours

* commit '2473783bbdf6b8ddc5affe8a394a1aa20c24f65d':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:24:38 +0000 (03:24 +0000)]

am 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT MERGE am: 35424cc2a6  -s ours am: 8a901a6133  -s ours am: 6cf8795a68  -s ours am: 2d714406cd  -s ours am: ed94b5520d  -s ours am: 3e1c84ad8c  -s ours am: 4c6f47c15e  -s ours
am: f4dd532c3e  -s ours

* commit 'f4dd532c3e8d63805482cfb911cd2d50454a0837':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:24:34 +0000 (03:24 +0000)]

Import translations. DO NOT MERGE am: c81b0617a6  -s ours am: 431d174f26  -s ours am: 8eef658cf9  -s ours am: 1e6e698881  -s ours am: cfb6dac38f  -s ours am: 5168f039b3  -s ours am: 83e41764c1  -s ours
am: e0342fad73  -s ours

* commit 'e0342fad73f011b65ee566a652ba556566f3533b':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:24:30 +0000 (03:24 +0000)]

Import translations. DO NOT MERGE am: 81403969d1  -s ours am: bbe424e584  -s ours am: 5b53a47d02  -s ours am: 9b7386403a  -s ours am: 994502244e  -s ours am: 2573cb9c33  -s ours am: 1e52e4df04  -s ours
am: 0df33c9132  -s ours

* commit '0df33c9132542f746cc13e6cf4d30f80810cdee5':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:24:26 +0000 (03:24 +0000)]

Import translations. DO NOT MERGE am: 01614d6ba5  -s ours am: 8454595cf3  -s ours am: 3f3f0fbc02  -s ours am: 2693dd2cd9  -s ours am: 1edcac1745  -s ours am: dc4f328c4d  -s ours am: 7cdd35ca3c  -s ours
am: 03612b0a04  -s ours

* commit '03612b0a04f68638f7b6ab075f1af430ca707aee':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:24:21 +0000 (03:24 +0000)]

Import translations. DO NOT MERGE am: c4d66cf035  -s ours am: 3209b2bc4d  -s ours am: 69830841ec  -s ours am: 4baaf3241f  -s ours am: 5148e0d456  -s ours am: 21abe0d9f7  -s ours am: 9c2588976f  -s ours
am: d487fcd435  -s ours

* commit 'd487fcd4354007dc0a9ad1f4b9f94e557b268d80':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:24:08 +0000 (03:24 +0000)]

am ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658 am: 7fd445f4cc am: 5d6886a1cf am: 38bd557502 am: 0442deaee7 am: 5793b647fd am: f351d2d274 am: cf067a9a44
am: 4d31a0b5f1

* commit '4d31a0b5f1a2421a32581397c88b51e57ddfcf9d':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 03:24:01 +0000 (03:24 +0000)]

am e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 149268d869 am: 70aa099f23 am: eadf9b6782 am: 24483f0498 am: a107ef6e13 am: f7f8df9f7c am: 94fd0e00d1
am: 12a5698507

* commit '12a5698507f2a31384ec243f0eb54576acec5ea9':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 03:24:00 +0000 (03:24 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 8dc2ca68c1 am: a59ef0ba69 am: 8acd2748b2 am: 52599958f4 am: 1c13c13722 am: d848ca4869 am: 4cb42d165f am: aa27d4ebde am: 96e7b9c759 am: 7c1c0fcdca
am: b406a581e6

* commit 'b406a581e66d49bd7c8a8684af93b78e3e2c2f5c':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 03:23:58 +0000 (03:23 +0000)]

am 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: b1a081221e am: 1bd8f7e460 am: 7661d33379 am: 7e5ec74df0 am: 84138b1523 am: e90e2b89bb am: 26e7cd5b94
am: 29adb8de49

* commit '29adb8de4972dba97896ffb4e890f66ad1aa164a':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 03:23:58 +0000 (03:23 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: a2bc37722e am: b7b834bde1 am: ca2bafc86f am: 9774281221 am: 6df4bd8b7f am: 7f4c5f364f am: 22c5b7f57d am: 128ffad040 am: b1f7d716f6 am: 7ef659884d
am: 87ca2c2317

* commit '87ca2c23179d13d81b182bb0b2a2ef51cb9c53f8':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 03:23:56 +0000 (03:23 +0000)]

am 49635c71: am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: fb1a32a63d am: 27b99c86e9 am: 078afac399 am: 94b7ee378f am: 6b7a1631f6 am: 753cf130b9 am: bbf5c27346
am: 63251de093

* commit '63251de0934b39d2dc871d3d3fee9d5998289130':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 03:23:56 +0000 (03:23 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 6cb8ae4c16 am: 2feee6dec2 am: ab3847b8b3 am: 0cce0579a3 am: 8c9ef49ae5 am: cbdc96152e am: 1115f891dd am: e1ac2ece02 am: 856f970b80 am: 94d220ca6a
am: 3e37b94e86

* commit '3e37b94e864c0f56d338fe32f609d67c18a93348':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 03:23:52 +0000 (03:23 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 7c9f33481f am: 68c0bedde8 am: 59329359e7 am: daf2da93f6 am: 4cad8c7747 am: 1df97e4e4b am: f616a8e2d1 am: 5175506151 am: 3e5bae9519 am: 338bcd2bf1
am: 6af83d1c4c

* commit '6af83d1c4cd3ab42403ed139d72b84274e714503':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 03:23:51 +0000 (03:23 +0000)]

am a4d0ef3c: am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 64b83ce632 am: 346da07c80 am: 78a44d4726 am: 8abc959461 am: 6060c10580 am: 9d494757cf am: daf82e6d8c
am: d8b2144af4

* commit 'd8b2144af4d59646d744b8d802e2a2b11008019f':

commit | commitdiff | tree

Mathew Inwood [Tue, 20 Oct 2015 03:23:45 +0000 (03:23 +0000)]

am 48e725bd: am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d5da3cc1d8 am: 7748c94d25 am: 4396cc1fff am: a267cb6dde am: f289060a04 am: 3b678d2e58 am: e147ed8705
am: 83163c5011

* commit '83163c501180a7f970a3501e8c3e07cf56705a7d':

commit | commitdiff | tree

Mathew Inwood [Tue, 20 Oct 2015 03:23:45 +0000 (03:23 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 56ca86b7c1 am: 52cced3ede am: 9cd759a5e1 am: a9d4118ab3 am: 8020ebf7bc am: df112558f3 am: d2688e3c3a am: f051b6136b am: e1aa8a0a91 am: d8f4de51e2
am: f82ff953b0

* commit 'f82ff953b0921a722485064e0f3b0fd86e715942':

commit | commitdiff | tree

Juan Silveira [Tue, 20 Oct 2015 03:23:40 +0000 (03:23 +0000)]

am 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 524ed6adda am: 3f39cc45d8 am: 6120e6096a am: d9ba2b56db am: 8dc63a93c6 am: b897ea777e am: f5e5e1270d
am: eaccb5a5b4

* commit 'eaccb5a5b4eb8724833e78ad545c8eb68a4e6bd2':

commit | commitdiff | tree

Juan Silveira [Tue, 20 Oct 2015 03:23:39 +0000 (03:23 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 07130d400c am: b6973a57c3 am: a379acb1cb am: 28c9e80cc0 am: abe2da3ed1 am: 67e3373948 am: 8d9f5baea1 am: 608f1ee85e am: ff6bb00bf5 am: eb2a652497
am: b4d431652b

* commit 'b4d431652b4a65332b061ff2c3271501b57424f8':

commit | commitdiff | tree

Anton Hansson [Tue, 20 Oct 2015 03:23:34 +0000 (03:23 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d0642c4274 am: 216a53f0b1 am: aeb301c7e5 am: 817bbecd42 am: 14861fae4d am: 59fcb9ce40 am: f882fb27b7 am: c314292efc am: c009ae9374 am: 6c1651728c
am: bdc9386e11

* commit 'bdc9386e11e429d519d5fe0a828d6071a4872fbd':

commit | commitdiff | tree

Anton Hansson [Tue, 20 Oct 2015 03:23:33 +0000 (03:23 +0000)]

am 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 0274f0a568 am: cb168d34ae am: 616facd74b am: 4c5dbc52b3 am: ed0c3623a9 am: bf4e852f95 am: 5c02e22455
am: 982cbc361c

* commit '982cbc361cf5d7104a5ab046550112c9eb569004':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 03:23:29 +0000 (03:23 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 853b55b96e am: 61172868fd am: 157e6c57d6 am: d078023bce am: 5b55c46e01 am: 186a1a7060 am: d566d24f65 am: b0436f294f am: dfa6fd246a am: eb243d0c8f
am: 0f93780b43

* commit '0f93780b43568a3faee3b825599f5e88fbbb1d21':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 03:23:26 +0000 (03:23 +0000)]

am b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 5cc929caa0 am: 5c597e4aba am: 1dda00996a am: b523cc1e4f am: 622880c0b9 am: 65f484b1fc am: 7c811ecaaf
am: 9c0a25b58c

* commit '9c0a25b58c0f1f620d57ecae170e5fb5e442fb41':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 03:23:25 +0000 (03:23 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 9e3ebf3c95 am: d072686669 am: f351edd651 am: 49bc959e07 am: 9c3d1aee2f am: 319c9ac41f am: 1497b879e4 am: 02173b0c65 am: 5af66c53bf am: 97567d6a48
am: 7a6c3a7737

* commit '7a6c3a7737af293bdf855298f16260722561b659':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 03:23:21 +0000 (03:23 +0000)]

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am: 381fa3fb2d am: f8f29b43ff am: 92557c9596 am: a324418ece am: 8194e08397 am: f41815802e am: 6dc5663ab3 am: f5437de749 am: 3519549f36 am: 95fb7b3ca5
am: 07c3f75892

* commit '07c3f758927f17a7d5986d83447e51e5b874fec3':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:23:19 +0000 (03:23 +0000)]

keep history after reset to ub-now-lunchbox-release@1069658 am: 2b8dbe3a5f am: 319e21ec62 am: ce566c0e93 am: 1c30b578e1 am: 9fa7ca7d65 am: dcc908e147 -s ours am: af265461f1
am: 9d06c95c57

* commit '9d06c95c575248043e64821568a30131926f18b1':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:22:21 +0000 (03:22 +0000)]

Import translations. DO NOT MERGE am: 2c29ac6eb5  -s ours am: b58e5fbc57  -s ours am: 2aa01afb35  -s ours am: 25c42a0937  -s ours am: a34c8cc2ba  -s ours am: 446b98f4e4  -s ours
am: 90022fd4c9  -s ours

* commit '90022fd4c98a8d206bd23b3ec09dc9e710ccb4f8':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:22:17 +0000 (03:22 +0000)]

am 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT MERGE am: 35424cc2a6  -s ours am: 8a901a6133  -s ours am: 6cf8795a68  -s ours am: 2d714406cd  -s ours am: ed94b5520d  -s ours am: 3e1c84ad8c  -s ours
am: 4c6f47c15e  -s ours

* commit '4c6f47c15eb13f297be5d19423eebb6f1b683b11':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:22:13 +0000 (03:22 +0000)]

Import translations. DO NOT MERGE am: c81b0617a6  -s ours am: 431d174f26  -s ours am: 8eef658cf9  -s ours am: 1e6e698881  -s ours am: cfb6dac38f  -s ours am: 5168f039b3  -s ours
am: 83e41764c1  -s ours

* commit '83e41764c19e5b2e1ef00b7bed6a1f8f7bca2b1e':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:22:08 +0000 (03:22 +0000)]

Import translations. DO NOT MERGE am: 81403969d1  -s ours am: bbe424e584  -s ours am: 5b53a47d02  -s ours am: 9b7386403a  -s ours am: 994502244e  -s ours am: 2573cb9c33  -s ours
am: 1e52e4df04  -s ours

* commit '1e52e4df0461dd9453a732527bfbadf4cea34441':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:22:04 +0000 (03:22 +0000)]

Import translations. DO NOT MERGE am: 01614d6ba5  -s ours am: 8454595cf3  -s ours am: 3f3f0fbc02  -s ours am: 2693dd2cd9  -s ours am: 1edcac1745  -s ours am: dc4f328c4d  -s ours
am: 7cdd35ca3c  -s ours

* commit '7cdd35ca3c444b1c532620893754d68bf502f851':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:22:00 +0000 (03:22 +0000)]

Import translations. DO NOT MERGE am: c4d66cf035  -s ours am: 3209b2bc4d  -s ours am: 69830841ec  -s ours am: 4baaf3241f  -s ours am: 5148e0d456  -s ours am: 21abe0d9f7  -s ours
am: 9c2588976f  -s ours

* commit '9c2588976f49c7183b844658fc7e5319230977bf':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:21:56 +0000 (03:21 +0000)]

am ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658 am: 7fd445f4cc am: 5d6886a1cf am: 38bd557502 am: 0442deaee7 am: 5793b647fd am: f351d2d274
am: cf067a9a44

* commit 'cf067a9a44f00315d11c72432602fb8b9e03cf73':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 03:21:53 +0000 (03:21 +0000)]

am e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 149268d869 am: 70aa099f23 am: eadf9b6782 am: 24483f0498 am: a107ef6e13 am: f7f8df9f7c
am: 94fd0e00d1

* commit '94fd0e00d115fb60eba1cfbf94e72fb841188587':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 03:21:48 +0000 (03:21 +0000)]

am 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: b1a081221e am: 1bd8f7e460 am: 7661d33379 am: 7e5ec74df0 am: 84138b1523 am: e90e2b89bb
am: 26e7cd5b94

* commit '26e7cd5b94130811fd5557174b8ed023780d429e':

commit | commitdiff | tree

Huy Nguyen [Tue, 20 Oct 2015 03:21:45 +0000 (03:21 +0000)]

am 49635c71: am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: fb1a32a63d am: 27b99c86e9 am: 078afac399 am: 94b7ee378f am: 6b7a1631f6 am: 753cf130b9
am: bbf5c27346

* commit 'bbf5c273465e266ab26f02110f54991f4850af30':

commit | commitdiff | tree

Mark Ashdown [Tue, 20 Oct 2015 03:21:39 +0000 (03:21 +0000)]

am a4d0ef3c: am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 64b83ce632 am: 346da07c80 am: 78a44d4726 am: 8abc959461 am: 6060c10580 am: 9d494757cf
am: daf82e6d8c

* commit 'daf82e6d8c35b1b09dfce13998eb77ddb7840622':

commit | commitdiff | tree

Mathew Inwood [Tue, 20 Oct 2015 03:21:35 +0000 (03:21 +0000)]

am 48e725bd: am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d5da3cc1d8 am: 7748c94d25 am: 4396cc1fff am: a267cb6dde am: f289060a04 am: 3b678d2e58
am: e147ed8705

* commit 'e147ed87056f616c4798eb243615f6f9de5380e9':

commit | commitdiff | tree

Juan Silveira [Tue, 20 Oct 2015 03:21:31 +0000 (03:21 +0000)]

am 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 524ed6adda am: 3f39cc45d8 am: 6120e6096a am: d9ba2b56db am: 8dc63a93c6 am: b897ea777e
am: f5e5e1270d

* commit 'f5e5e1270d7186ccbca50a8515145d01c5cf2689':

commit | commitdiff | tree

Anton Hansson [Tue, 20 Oct 2015 03:21:28 +0000 (03:21 +0000)]

am 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 0274f0a568 am: cb168d34ae am: 616facd74b am: 4c5dbc52b3 am: ed0c3623a9 am: bf4e852f95
am: 5c02e22455

* commit '5c02e224552e9df198bd49b4c82906c6078999a2':

commit | commitdiff | tree

Adam Skory [Tue, 20 Oct 2015 03:21:23 +0000 (03:21 +0000)]

am b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 5cc929caa0 am: 5c597e4aba am: 1dda00996a am: b523cc1e4f am: 622880c0b9 am: 65f484b1fc
am: 7c811ecaaf

* commit '7c811ecaaf91dc102e45d9055e91270d04140c29':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:21:19 +0000 (03:21 +0000)]

keep history after reset to ub-now-lunchbox-release@1069658 am: 2b8dbe3a5f am: 319e21ec62 am: ce566c0e93 am: 1c30b578e1 am: 9fa7ca7d65 am: dcc908e147 -s ours
am: af265461f1

* commit 'af265461f1c56e3a7adc42f34032f45b8522722a':

commit | commitdiff | tree

Baligh Uddin [Tue, 20 Oct 2015 03:19:50 +0000 (03:19 +0000)]

Import translations. DO NOT MERGE am: 2c29ac6eb5  -s ours am: b58e5fbc57  -s ours am: 2aa01afb35  -s ours am: 25c42a0937  -s ours am: a34c8cc2ba  -s ours
am: 446b98f4e4  -s ours

* commit '446b98f4e451813247a4b4d8aac690ee936c634d':
  Import translations. DO NOT MERGE