OSDN Git Service
Juan Silveira [Tue, 20 Oct 2015 01:30:41 +0000 (01:30 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
07130d400c am:
b6973a57c3 am:
a379acb1cb am:
28c9e80cc0
am:
abe2da3ed1
* commit '
abe2da3ed1118861d5997c61d05018290f2a7e61':
Anton Hansson [Tue, 20 Oct 2015 01:30:37 +0000 (01:30 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
d0642c4274 am:
216a53f0b1 am:
aeb301c7e5 am:
817bbecd42
am:
14861fae4d
* commit '
14861fae4d377d5a9b95b84bf6f247586ffd4401':
Adam Skory [Tue, 20 Oct 2015 01:30:33 +0000 (01:30 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
853b55b96e am:
61172868fd am:
157e6c57d6 am:
d078023bce
am:
5b55c46e01
* commit '
5b55c46e015bd9bfe2fd72ae090add4eb189adb3':
Adam Skory [Tue, 20 Oct 2015 01:30:29 +0000 (01:30 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
9e3ebf3c95 am:
d072686669 am:
f351edd651 am:
49bc959e07
am:
9c3d1aee2f
* commit '
9c3d1aee2f0a74b30a44bb5b64e37e399db0c1cc':
Adam Skory [Tue, 20 Oct 2015 01:30:23 +0000 (01:30 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am:
381fa3fb2d am:
f8f29b43ff am:
92557c9596 am:
a324418ece
am:
8194e08397
* commit '
8194e0839760fd5e8eb785c0945b046dff5c7a7c':
Adam Cohen [Tue, 20 Oct 2015 01:13:14 +0000 (01:13 +0000)]
am
ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop am:
e7afa51bd8 am:
6d0a93207e
am:
a5eae84cbf
* commit '
a5eae84cbf218dc932dfaebcacceefe55fed18b8':
Adam Cohen [Tue, 20 Oct 2015 01:13:11 +0000 (01:13 +0000)]
am
755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop am:
84a79949a4 am:
313c1de1cc
am:
20053bc691
* commit '
20053bc691fad846d7220d9aaa0ea62c9e864840':
Sunny Goyal [Tue, 20 Oct 2015 01:13:08 +0000 (01:13 +0000)]
am
8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created am:
fdbfba88d4 -s ours am:
852a96562a
am:
153ccdf5ee
* commit '
153ccdf5ee6d9d97eb36597d5bed79e5d6a0c71a':
Ian Parkinson [Tue, 20 Oct 2015 01:13:02 +0000 (01:13 +0000)]
Adam Cohen [Tue, 20 Oct 2015 01:12:58 +0000 (01:12 +0000)]
Kenny Guy [Tue, 20 Oct 2015 01:12:52 +0000 (01:12 +0000)]
am
0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop am:
5f2a520f0c am:
689cb6366b
am:
e431703711
* commit '
e431703711bf883b139f41fdd21ecf3c34b79ea8':
Adam Cohen [Tue, 20 Oct 2015 01:12:48 +0000 (01:12 +0000)]
am
52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop am:
91c11b28d5 am:
7e88e90afc
am:
b75de587c5
* commit '
b75de587c52ee4f9ba5ada289c0675f1fafdc7f9':
Bjorn Bringert [Tue, 20 Oct 2015 01:12:44 +0000 (01:12 +0000)]
Sunny Goyal [Tue, 20 Oct 2015 01:12:40 +0000 (01:12 +0000)]
am
6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop am:
e7599d6943 am:
5d36c5b03b
am:
ab1bfbf928
* commit '
ab1bfbf9285e6d917c94ec1b4c57c66d57cb6c23':
Baligh Uddin [Tue, 20 Oct 2015 01:12:33 +0000 (01:12 +0000)]
am
10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am:
ab474588ce -s ours am:
eb8ce94244 -s ours
am:
56985a1867 -s ours
* commit '
56985a1867525557fd15a1b74fc768945ebc56c6':
Sunny Goyal [Tue, 20 Oct 2015 01:12:27 +0000 (01:12 +0000)]
am
c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons am:
e43f0d646c am:
ffe21b3129
am:
f321db6800
* commit '
f321db6800bbfc1e95f82ca6f01002f7d3e5bf2d':
Juan Silveira [Tue, 20 Oct 2015 01:12:24 +0000 (01:12 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
07130d400c am:
b6973a57c3 am:
a379acb1cb
am:
28c9e80cc0
* commit '
28c9e80cc092358330c5f42449739c208400c666':
Sunny Goyal [Tue, 20 Oct 2015 01:12:23 +0000 (01:12 +0000)]
Anton Hansson [Tue, 20 Oct 2015 01:12:18 +0000 (01:12 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
d0642c4274 am:
216a53f0b1 am:
aeb301c7e5
am:
817bbecd42
* commit '
817bbecd42d21efe787b2bc90432f2f85edd4b28':
Adam Cohen [Tue, 20 Oct 2015 01:12:17 +0000 (01:12 +0000)]
am
d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring to a screen, not a rank" into ub-now-porkchop am:
cb20616a18 am:
86b4730bb5
am:
278d4d2d5a
* commit '
278d4d2d5af5abff45633301976e861196bd90ac':
Adam Skory [Tue, 20 Oct 2015 01:12:14 +0000 (01:12 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
853b55b96e am:
61172868fd am:
157e6c57d6
am:
d078023bce
* commit '
d078023bcee35457d2bbd804c58b89ee7eec9d17':
Baligh Uddin [Tue, 20 Oct 2015 01:12:12 +0000 (01:12 +0000)]
am
68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am:
6317598a19 -s ours am:
bfe4347964 -s ours
am:
669ef65afb -s ours
* commit '
669ef65afbb3799333b4e961371b920653ec870f':
Adam Skory [Tue, 20 Oct 2015 01:12:08 +0000 (01:12 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
9e3ebf3c95 am:
d072686669 am:
f351edd651
am:
49bc959e07
* commit '
49bc959e074295009b5024d43519f8ba3e20d0bb':
Adam Skory [Tue, 20 Oct 2015 01:12:02 +0000 (01:12 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am:
381fa3fb2d am:
f8f29b43ff am:
92557c9596
am:
a324418ece
* commit '
a324418ecef0fff08695f29b6bf191049bf79598':
Adam Cohen [Tue, 20 Oct 2015 00:54:55 +0000 (00:54 +0000)]
am
ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop am:
e7afa51bd8
am:
6d0a93207e
* commit '
6d0a93207ebb2ed8380e398ca3ecc5965975c778':
Adam Cohen [Tue, 20 Oct 2015 00:54:51 +0000 (00:54 +0000)]
am
755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop am:
84a79949a4
am:
313c1de1cc
* commit '
313c1de1cc69d9d4b59fd2b2f88fdba26bc8d4de':
Sunny Goyal [Tue, 20 Oct 2015 00:54:48 +0000 (00:54 +0000)]
am
8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created am:
fdbfba88d4 -s ours
am:
852a96562a
* commit '
852a96562af274cb6768f7370436d632fcf7ed05':
Ian Parkinson [Tue, 20 Oct 2015 00:54:44 +0000 (00:54 +0000)]
Adam Cohen [Tue, 20 Oct 2015 00:54:41 +0000 (00:54 +0000)]
Kenny Guy [Tue, 20 Oct 2015 00:54:37 +0000 (00:54 +0000)]
am
0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop am:
5f2a520f0c
am:
689cb6366b
* commit '
689cb6366b4cc4a205ad7a3696c04fe6f5ec28c3':
Adam Cohen [Tue, 20 Oct 2015 00:54:31 +0000 (00:54 +0000)]
am
52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop am:
91c11b28d5
am:
7e88e90afc
* commit '
7e88e90afc2fce3e64735ee0f11b9098193253d3':
Bjorn Bringert [Tue, 20 Oct 2015 00:54:27 +0000 (00:54 +0000)]
Sunny Goyal [Tue, 20 Oct 2015 00:54:23 +0000 (00:54 +0000)]
am
6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop am:
e7599d6943
am:
5d36c5b03b
* commit '
5d36c5b03bbbd2906a74e4c9c17faa74f5d4c4ec':
Baligh Uddin [Tue, 20 Oct 2015 00:54:18 +0000 (00:54 +0000)]
am
10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am:
ab474588ce -s ours
am:
eb8ce94244 -s ours
* commit '
eb8ce94244706fd12d41740ad949469a10c5ab43':
Sunny Goyal [Tue, 20 Oct 2015 00:54:14 +0000 (00:54 +0000)]
am
c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons am:
e43f0d646c
am:
ffe21b3129
* commit '
ffe21b31295b2195b219372394096253dda64e89':
Sunny Goyal [Tue, 20 Oct 2015 00:54:08 +0000 (00:54 +0000)]
Juan Silveira [Tue, 20 Oct 2015 00:54:05 +0000 (00:54 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
07130d400c am:
b6973a57c3
am:
a379acb1cb
* commit '
a379acb1cbe729b44362666bf5a9ac8f27108622':
Adam Cohen [Tue, 20 Oct 2015 00:54:03 +0000 (00:54 +0000)]
am
d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring to a screen, not a rank" into ub-now-porkchop am:
cb20616a18
am:
86b4730bb5
* commit '
86b4730bb5217268c3abd4444c34b2876a7c3ebc':
Anton Hansson [Tue, 20 Oct 2015 00:54:00 +0000 (00:54 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
d0642c4274 am:
216a53f0b1
am:
aeb301c7e5
* commit '
aeb301c7e5c7d4727b3da4b67de46bcac7d2619d':
Baligh Uddin [Tue, 20 Oct 2015 00:53:58 +0000 (00:53 +0000)]
am
68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am:
6317598a19 -s ours
am:
bfe4347964 -s ours
* commit '
bfe43479643fece25c8aeabb64b90ca9d6c028be':
Adam Skory [Tue, 20 Oct 2015 00:53:54 +0000 (00:53 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
853b55b96e am:
61172868fd
am:
157e6c57d6
* commit '
157e6c57d6b9093e2d491b979b4744fe35052242':
Adam Skory [Tue, 20 Oct 2015 00:53:49 +0000 (00:53 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
9e3ebf3c95 am:
d072686669
am:
f351edd651
* commit '
f351edd6519615d60cb646a6976bc69caa5e7dc2':
Adam Skory [Tue, 20 Oct 2015 00:53:44 +0000 (00:53 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am:
381fa3fb2d am:
f8f29b43ff
am:
92557c9596
* commit '
92557c9596e2568336fe5f6d4bb36d579205feb2':
Juan Silveira [Tue, 20 Oct 2015 00:33:30 +0000 (00:33 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
07130d400c
am:
b6973a57c3
* commit '
b6973a57c35f4ff27034b088b4778b1bcbdb404b':
Anton Hansson [Tue, 20 Oct 2015 00:33:25 +0000 (00:33 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
d0642c4274
am:
216a53f0b1
* commit '
216a53f0b12c048a531dd7bdf3a02f59e18a808d':
Adam Skory [Tue, 20 Oct 2015 00:33:21 +0000 (00:33 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
853b55b96e
am:
61172868fd
* commit '
61172868fde38da7f7ec8dcb84288d51095948e1':
Adam Skory [Tue, 20 Oct 2015 00:33:17 +0000 (00:33 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am:
9e3ebf3c95
am:
d072686669
* commit '
d0726866694356f674ee80ca83ad97ff930bce20':
Adam Skory [Tue, 20 Oct 2015 00:33:10 +0000 (00:33 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release am:
381fa3fb2d
am:
f8f29b43ff
* commit '
f8f29b43ff7ecf9346e12e965ee90480617525bf':
Adam Cohen [Tue, 20 Oct 2015 00:29:19 +0000 (00:29 +0000)]
am
ae5f7ce8: Merge "Fixing typo from previous CL" into ub-now-porkchop
am:
e7afa51bd8
* commit '
e7afa51bd8f0f0b9f21bd63a9ceeb9f330259fc2':
Adam Cohen [Tue, 20 Oct 2015 00:29:15 +0000 (00:29 +0000)]
am
755dd702: Merge "Fix missing screen when adding widget directly to provider" into ub-now-porkchop
am:
84a79949a4
* commit '
84a79949a478f8b91c7fcc9346525f7dd187f548':
Sunny Goyal [Tue, 20 Oct 2015 00:29:10 +0000 (00:29 +0000)]
am
8cce9dd8: DO NOT MERGE Rechecking unrestored items when launcher gets created
am:
fdbfba88d4 -s ours
* commit '
fdbfba88d4f08d7a721d91b7e3d30ee5a290be6e':
Ian Parkinson [Tue, 20 Oct 2015 00:29:04 +0000 (00:29 +0000)]
am
0c2918f4: Use View.generateViewId if available
am:
3d78b80ecd
* commit '
3d78b80ecdfeec7704b2aa82ce39823fa903ea61':
Adam Cohen [Tue, 20 Oct 2015 00:28:59 +0000 (00:28 +0000)]
Kenny Guy [Tue, 20 Oct 2015 00:28:53 +0000 (00:28 +0000)]
am
0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop
am:
5f2a520f0c
* commit '
5f2a520f0cd47b274bdf809d7b665c956c2717ed':
Adam Cohen [Tue, 20 Oct 2015 00:28:44 +0000 (00:28 +0000)]
am
52077b7a: Merge "Don\'t let old Launcher activity interfere with new one" into ub-now-porkchop
am:
91c11b28d5
* commit '
91c11b28d57c026d507488c58feedebf7fee6f31':
Bjorn Bringert [Tue, 20 Oct 2015 00:28:36 +0000 (00:28 +0000)]
am
2ed99e86: Build Launcher3 against prebuilt SDK 21
am:
c656245b9c
* commit '
c656245b9cbc370537afb18e7fb38ea87c233fd1':
Sunny Goyal [Tue, 20 Oct 2015 00:28:30 +0000 (00:28 +0000)]
am
6d467e27: Merge "Resetting launcherProvider data if restore set was empty" into ub-now-porkchop
am:
e7599d6943
* commit '
e7599d694313845a41221dfa0d7f6dca3aedd02c':
Baligh Uddin [Tue, 20 Oct 2015 00:28:25 +0000 (00:28 +0000)]
am
10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
am:
ab474588ce -s ours
* commit '
ab474588ce7d9cddff2b2dc0a2fd91b4ae532e05':
Sunny Goyal [Tue, 20 Oct 2015 00:28:19 +0000 (00:28 +0000)]
am
c5fb59fb: Fixing loadWorkspace being called multiple times Using right intent when refreshing shortcut icons
am:
e43f0d646c
* commit '
e43f0d646c60c6f59333224686725717cdf2ccbc':
Sunny Goyal [Tue, 20 Oct 2015 00:28:14 +0000 (00:28 +0000)]
Adam Cohen [Tue, 20 Oct 2015 00:28:06 +0000 (00:28 +0000)]
am
d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring to a screen, not a rank" into ub-now-porkchop
am:
cb20616a18
* commit '
cb20616a180de2855cc35e6c1ce8dfb8082ea41c':
Juan Silveira [Tue, 20 Oct 2015 00:28:01 +0000 (00:28 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am:
07130d400c
* commit '
07130d400c52518e413e58334525f1598c3b8f1a':
Baligh Uddin [Tue, 20 Oct 2015 00:28:00 +0000 (00:28 +0000)]
am
68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
am:
6317598a19 -s ours
* commit '
6317598a196ada3f32950c7f4a8d5cfe005acf42':
Anton Hansson [Tue, 20 Oct 2015 00:27:55 +0000 (00:27 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am:
d0642c4274
* commit '
d0642c4274abcbede9177d61b0f072689db889a9':
Adam Skory [Tue, 20 Oct 2015 00:27:51 +0000 (00:27 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am:
853b55b96e
* commit '
853b55b96e4af7a4f949a22cc084bd333e528c1c':
Adam Skory [Tue, 20 Oct 2015 00:27:43 +0000 (00:27 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am:
9e3ebf3c95
* commit '
9e3ebf3c95fbf4b7a96b6080802ca23e5098fe40':
Adam Skory [Tue, 20 Oct 2015 00:27:39 +0000 (00:27 +0000)]
Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release
am:
381fa3fb2d
* commit '
381fa3fb2d990f7976a898c16f3675dbb325b848':
The Android Automerger [Thu, 26 Mar 2015 21:19:47 +0000 (21:19 +0000)]
am
aae99eaa: am
b2b58c8f: merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
* commit '
aae99eaa148ad74efbcd1519cc34363823e3c560':
fix build
fix build
The Android Automerger [Thu, 26 Mar 2015 21:00:22 +0000 (21:00 +0000)]
am
b2b58c8f: merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
* commit '
b2b58c8f6cbed5a1290dd4d541157e68e3b29a1b':
fix build
fix build
Geoff Mendal [Thu, 26 Feb 2015 23:14:50 +0000 (23:14 +0000)]
am
729ad90f: (-s ours) Import translations. DO NOT MERGE
* commit '
729ad90fb6c1b5c7c6e79507beb00934fbdd44ea':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 26 Feb 2015 21:21:32 +0000 (13:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ibdacd9febbe2e1d8a282af7a856d27fbffb1014c
Auto-generated-cl: translation import
Geoff Mendal [Fri, 13 Feb 2015 01:14:55 +0000 (01:14 +0000)]
am
875cdbd2: (-s ours) Import translations. DO NOT MERGE
* commit '
875cdbd24b1ab3627d9663a49fcb943cdb5b91b4':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 13 Feb 2015 01:08:33 +0000 (17:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2287d714cc1f58f409083c256fa4431dc1e4a918
Auto-generated-cl: translation import
The Android Automerger [Tue, 3 Feb 2015 17:05:59 +0000 (09:05 -0800)]
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
Ying Wang [Mon, 2 Feb 2015 18:33:05 +0000 (10:33 -0800)]
Fix Android.mk.
- You don't need to explicitly specify protobuf library; The library
name has been changed and the build system automatically adds it.
- You can't have a file target $(LOCAL_BUILT_MODULE) depend on phony target
launcher_protoutil_lib.
- "include $(call all-makefiles-under,$(LOCAL_PATH))" must be on the
last line.
(cherry picked from commit
3d74c6632ed6ab23db0cde80bc8a61daecfd49ef)
Change-Id: I27d967a57d6a9373da50821af32191614a3c8bc7
Jeff Davidson [Tue, 16 Sep 2014 01:14:39 +0000 (18:14 -0700)]
Update protobuf library from 2.3 to 2.6.
The dependency here can be removed because it it automatically added
when LOCAL_PROTOC_OPTIMIZE_TYPE=nano by
build/core/host_java_library_common.mk.
Change-Id: I949d32fb5126f1c05e2a6ed48f6636a4a9b15a48
Brian Carlstrom [Sun, 1 Feb 2015 06:46:55 +0000 (22:46 -0800)]
Move from host-libprotobuf-java-2.3.0-nano to current version
Change-Id: I87e768fc95738358eddcca9b524d7546ed632e4b
Nick Kralevich [Sat, 18 Oct 2014 13:57:06 +0000 (06:57 -0700)]
fix build
Bug:
18040469
Change-Id: I24db4d3f4b7ee10ecf5a2c65035ce112271539fb
Nick Kralevich [Sat, 18 Oct 2014 15:14:09 +0000 (08:14 -0700)]
fix build
Bug:
18040469
Change-Id: I2938c7b950470eeacfb20391f109ae44d95060c7
The Android Automerger [Tue, 9 Dec 2014 01:22:44 +0000 (01:22 +0000)]
merge in ub-now-queens-release history after reset to ub-now-queens
Geoff Mendal [Mon, 8 Dec 2014 19:16:09 +0000 (11:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5afb7119527734723b3bd4e35e66844b62f74d95
Auto-generated-cl: translation import
Adam Cohen [Thu, 4 Dec 2014 18:34:57 +0000 (10:34 -0800)]
Avoid db exception on L and above
Bug
18554839
Change-Id: I43f391b7cc376f697ce7b5b363e8be3aa85814b5
Adam Cohen [Thu, 4 Dec 2014 18:17:52 +0000 (18:17 +0000)]
am
d2285942: (-s ours) Merge "Ignoring specific db exception DO NOT MERGE" into ub-now-porkchop
* commit '
d2285942dde8f2633f1d79abc01e598da7925090':
Ignoring specific db exception DO NOT MERGE
Adam Cohen [Thu, 4 Dec 2014 18:14:22 +0000 (18:14 +0000)]
Merge "Ignoring specific db exception DO NOT MERGE" into ub-now-porkchop
Winson Chung [Mon, 1 Dec 2014 23:05:17 +0000 (15:05 -0800)]
Ignoring specific db exception DO NOT MERGE
Bug
18554839.
Change-Id: I80f2dd62297eea671f2d129ae22263e72e506ae4
(cherry picked from commit
5f05913f71da68a6c406f905ec6979586e3ba27a)
The Android Automerger [Thu, 4 Dec 2014 17:56:30 +0000 (17:56 +0000)]
merge in ub-now-queens-release history after reset to ub-now-queens
Adam Cohen [Thu, 4 Dec 2014 17:34:10 +0000 (17:34 +0000)]
am
268b8907: Ensure that FirstFrameAnimatorHelper doesn\'t set play time when animation is complete
* commit '
268b8907d1f2fcf9775880c69899b3c6fbe85ea3':
Ensure that FirstFrameAnimatorHelper doesn't set play time when animation is complete
Adam Cohen [Tue, 2 Dec 2014 23:24:52 +0000 (15:24 -0800)]
Ensure that FirstFrameAnimatorHelper doesn't set play time when animation is complete
Bug:
18567716
Change-Id: I656e869b8553d650916c2abe6dc83282c8b6fd65
(cherry picked from commit
5c18b80ed9aaa57b27b56667e3699fd76bcce8ed)
Geoff Mendal [Thu, 4 Dec 2014 05:28:01 +0000 (05:28 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-now-queens
Geoff Mendal [Wed, 3 Dec 2014 19:01:37 +0000 (11:01 -0800)]
Import translations. DO NOT MERGE
Change-Id: If32589149a2b776b668510662360e04aa66ade88
Auto-generated-cl: translation import
Sunny Goyal [Wed, 3 Dec 2014 08:55:16 +0000 (14:25 +0530)]
Fixing wrong package check when adding shortcuts
Bug:
18571789,
18535867
Change-Id: I2544fa634879846d812b00f8649520400f66d29e
Adam Cohen [Tue, 2 Dec 2014 23:24:52 +0000 (15:24 -0800)]
Ensure that FirstFrameAnimatorHelper doesn't set play time when animation is complete
Bug:
18567716
Change-Id: I656e869b8553d650916c2abe6dc83282c8b6fd65
The Android Automerger [Tue, 2 Dec 2014 10:20:40 +0000 (10:20 +0000)]
merge in ub-now-queens-release history after reset to ub-now-queens
Winson Chung [Tue, 2 Dec 2014 00:30:45 +0000 (00:30 +0000)]
Merge "Ignoring specific db exception to workaround Bug.
18554839." into ub-now-queens
Winson Chung [Mon, 1 Dec 2014 23:05:17 +0000 (15:05 -0800)]
Ignoring specific db exception to workaround Bug.
18554839.
Change-Id: I80f2dd62297eea671f2d129ae22263e72e506ae4
Chris Wren [Mon, 24 Nov 2014 21:57:54 +0000 (16:57 -0500)]
Don't try to create an app state instance during restore.
Added a static utility function to get the DeviceProfile instead.
Bug:
18504164
Change-Id: Ia510a84f1c195e58acf3bf4d1f6a42c739fdd413
Geoff Mendal [Mon, 24 Nov 2014 14:21:53 +0000 (06:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0d7a075387e2ba2c8b9607620ae1d1197cf5cd99
Auto-generated-cl: translation import
The Android Automerger [Mon, 24 Nov 2014 13:28:30 +0000 (13:28 +0000)]
merge in ub-now-queens-release history after reset to ub-now-queens
Sunny Goyal [Fri, 21 Nov 2014 02:10:07 +0000 (02:10 +0000)]
Merge "Disabling auto addition of managed profile shortcuts" into ub-now-queens
Sunny Goyal [Fri, 21 Nov 2014 01:01:00 +0000 (17:01 -0800)]
Disabling auto addition of managed profile shortcuts
Bug:
16188104
Change-Id: Ib6464c22140df6d60112eb35f5983718b3db6288