OSDN Git Service
Dongwon Kang [Wed, 3 Dec 2014 21:49:29 +0000 (21:49 +0000)]
am
c0ab1086: am
25a05188: am
b0bbaec8: Merge "TIF: call tune() in HardwareSession" into lmp-mr1-dev
* commit '
c0ab1086f06a01d28858c3ded1a15aa53af2960a':
TIF: call tune() in HardwareSession
Dongwon Kang [Wed, 3 Dec 2014 20:40:45 +0000 (20:40 +0000)]
am
25a05188: am
b0bbaec8: Merge "TIF: call tune() in HardwareSession" into lmp-mr1-dev
* commit '
25a051880666022163b9a641737f26adc31e5477':
TIF: call tune() in HardwareSession
Sanket Padawe [Wed, 3 Dec 2014 20:33:30 +0000 (20:33 +0000)]
am
3a64032f: am
8e1b08ac: am
b13c12f5: Merge "Call entitlement on clicking tethering tile in quick settings." into lmp-mr1-dev
* commit '
3a64032fe6ed77b8a9bf45c2bb2ce1fc436a0ab9':
Call entitlement on clicking tethering tile in quick settings.
Jason Sams [Wed, 3 Dec 2014 20:33:25 +0000 (20:33 +0000)]
am
5f9e59b2: am
e4c82550: (-s ours) am
d6e9e61c: Merge "Fix bug in passing of context flags and version." into lmp-mr1-dev
* commit '
5f9e59b229c38bf86e12dc6a22ab3532448368e0':
Fix bug in passing of context flags and version.
Sanket Padawe [Wed, 3 Dec 2014 20:25:24 +0000 (20:25 +0000)]
am
8e1b08ac: am
b13c12f5: Merge "Call entitlement on clicking tethering tile in quick settings." into lmp-mr1-dev
* commit '
8e1b08ac261324f85f53ce2991df83ef53dfd2bf':
Call entitlement on clicking tethering tile in quick settings.
Jason Sams [Wed, 3 Dec 2014 20:25:19 +0000 (20:25 +0000)]
am
e4c82550: (-s ours) am
d6e9e61c: Merge "Fix bug in passing of context flags and version." into lmp-mr1-dev
* commit '
e4c825507dfcb2559ecf6401d06fa5a7ecc8e721':
Fix bug in passing of context flags and version.
Tor Norbye [Wed, 3 Dec 2014 17:38:37 +0000 (17:38 +0000)]
Merge "Add BIND_IMPORTANT to @BindServiceFlags"
Baligh Uddin [Wed, 3 Dec 2014 17:19:33 +0000 (17:19 +0000)]
am
8b2db65f: (-s ours) am
ee549e51: (-s ours) am
0fcd3f41: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
8b2db65f1b7efb30e90687203d895cb09db36c6f':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Dec 2014 17:19:29 +0000 (17:19 +0000)]
am
1686b5c3: (-s ours) am
70b44364: (-s ours) am
925c27be: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
1686b5c3f58a7732d74f5f1cfa7dbfa3107dba06':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Dec 2014 17:19:25 +0000 (17:19 +0000)]
am
842556a4: (-s ours) am
204f2628: (-s ours) am
91426aa2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
842556a450ec8de489e155599e3d24f47269bdcd':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Dec 2014 17:19:21 +0000 (17:19 +0000)]
am
13b56099: (-s ours) am
eb0fdf48: (-s ours) am
ed338377: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
13b560996a0b0e84ff1d60852d6d20112624dfdc':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Dec 2014 17:19:16 +0000 (17:19 +0000)]
am
1348bad2: (-s ours) am
c64e49ad: (-s ours) am
51bca143: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
1348bad20771eb46293d29f328a48f9fc47fc751':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Dec 2014 17:19:12 +0000 (17:19 +0000)]
am
24c6982d: (-s ours) am
a221d299: (-s ours) am
d33f84eb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
24c6982de4732007b9c02629bfb72a1dae791981':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Dec 2014 17:19:08 +0000 (17:19 +0000)]
am
d82f0819: (-s ours) am
42f0a843: (-s ours) am
fccb3b43: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
d82f08196b32c5182f3181dda08cb4e2d83e6064':
Import translations. DO NOT MERGE
Michael Wright [Wed, 3 Dec 2014 17:19:01 +0000 (17:19 +0000)]
am
eb26c8ee: am
4de2ab4c: am
7081a5d1: Merge "Correctly iterate through MediaProjection callbacks." into lmp-mr1-dev
* commit '
eb26c8ee2a25e37eab4a34d772e9e7d90ae71fe4':
Correctly iterate through MediaProjection callbacks.
Alan Viverette [Wed, 3 Dec 2014 17:18:53 +0000 (17:18 +0000)]
am
4483f461: am
bb241c3c: am
4eb2e04f: Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev
* commit '
4483f4611ee002b57f851aa3268ff610023c72c5':
Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting
Dan Sandler [Wed, 3 Dec 2014 17:18:45 +0000 (17:18 +0000)]
am
e43bab74: am
29f89da0: am
dfb39ce3: Merge "Turn off DEBUG_GESTURES" into lmp-mr1-dev
* commit '
e43bab74bc1cd8c58e165b59565c27f921b03714':
Turn off DEBUG_GESTURES
George Mount [Wed, 3 Dec 2014 17:18:38 +0000 (17:18 +0000)]
am
a3a53251: am
24fac506: am
561261d4: Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev
* commit '
a3a53251f1dfdd3620bfa9b0a8f350a9867826d9':
Keep snapshot order matching the shared elements.
Mike Lockwood [Wed, 3 Dec 2014 13:39:23 +0000 (13:39 +0000)]
Merge "Remove obsolete AudioManager audio dock plugged Intents"
Baligh Uddin [Wed, 3 Dec 2014 07:56:57 +0000 (07:56 +0000)]
am
ee549e51: (-s ours) am
0fcd3f41: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
ee549e515eedb86ff29917f2c8760b665e30d1ee':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Dec 2014 07:56:51 +0000 (07:56 +0000)]
am
70b44364: (-s ours) am
925c27be: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
70b44364a1a0c7d6879670ead2fcbc7be02ec7f8':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Dec 2014 07:56:46 +0000 (07:56 +0000)]
am
204f2628: (-s ours) am
91426aa2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
204f26284cab010913829c412d39c7eee576080f':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Dec 2014 07:56:41 +0000 (07:56 +0000)]
am
eb0fdf48: (-s ours) am
ed338377: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
eb0fdf48b75c567666676bb0b01ae098ab471407':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Dec 2014 07:56:36 +0000 (07:56 +0000)]
am
c64e49ad: (-s ours) am
51bca143: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
c64e49adcab9b9f7680eeef8d33e18c30bda54c0':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Dec 2014 07:56:31 +0000 (07:56 +0000)]
am
a221d299: (-s ours) am
d33f84eb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
a221d299c0f9a6ec82daf91bcd7ac739eefe653a':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Dec 2014 07:56:26 +0000 (07:56 +0000)]
am
42f0a843: (-s ours) am
fccb3b43: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
42f0a8434636497737dae01db719908cc45910e4':
Import translations. DO NOT MERGE
Michael Wright [Wed, 3 Dec 2014 07:56:20 +0000 (07:56 +0000)]
am
4de2ab4c: am
7081a5d1: Merge "Correctly iterate through MediaProjection callbacks." into lmp-mr1-dev
* commit '
4de2ab4c55f74a7e166f58c7b7e72fc47c0d24c1':
Correctly iterate through MediaProjection callbacks.
Alan Viverette [Wed, 3 Dec 2014 07:56:12 +0000 (07:56 +0000)]
am
bb241c3c: am
4eb2e04f: Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev
* commit '
bb241c3cdedb96d2a3a61e913102d6186f12103a':
Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting
Dan Sandler [Wed, 3 Dec 2014 07:56:07 +0000 (07:56 +0000)]
am
29f89da0: am
dfb39ce3: Merge "Turn off DEBUG_GESTURES" into lmp-mr1-dev
* commit '
29f89da0a8a38dd060c8bd277d7473ccc3843185':
Turn off DEBUG_GESTURES
George Mount [Wed, 3 Dec 2014 07:56:00 +0000 (07:56 +0000)]
am
24fac506: am
561261d4: Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev
* commit '
24fac506f0204433aa3d2314d3ac7f909b6eb67a':
Keep snapshot order matching the shared elements.
Dongwon Kang [Wed, 3 Dec 2014 02:39:19 +0000 (02:39 +0000)]
am
b0bbaec8: Merge "TIF: call tune() in HardwareSession" into lmp-mr1-dev
* commit '
b0bbaec8bec519e85c33b4a25fa138e8017d6424':
TIF: call tune() in HardwareSession
Dongwon Kang [Wed, 3 Dec 2014 02:22:09 +0000 (02:22 +0000)]
Merge "TIF: call tune() in HardwareSession" into lmp-mr1-dev
Sanket Padawe [Wed, 3 Dec 2014 02:19:06 +0000 (02:19 +0000)]
am
b13c12f5: Merge "Call entitlement on clicking tethering tile in quick settings." into lmp-mr1-dev
* commit '
b13c12f58db3026ad30849873b3b6fc664f5ce7b':
Call entitlement on clicking tethering tile in quick settings.
Jason Sams [Wed, 3 Dec 2014 02:19:00 +0000 (02:19 +0000)]
am
d6e9e61c: Merge "Fix bug in passing of context flags and version." into lmp-mr1-dev
* commit '
d6e9e61c9d9b7ba88ae7ade0418e17a3ac2ef341':
Fix bug in passing of context flags and version.
Baligh Uddin [Wed, 3 Dec 2014 02:18:55 +0000 (02:18 +0000)]
am
0fcd3f41: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
0fcd3f41079880abccf08c498b5e109dccfc4577':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Dec 2014 02:18:50 +0000 (02:18 +0000)]
am
925c27be: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
925c27bef875f20f4b34254c588296f10fc5fe5a':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Dec 2014 02:18:45 +0000 (02:18 +0000)]
am
91426aa2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
91426aa292455aef968e112c2255dd676f7f1ec6':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Dec 2014 02:18:40 +0000 (02:18 +0000)]
am
ed338377: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
ed3383770e77b88ab0692bee9acef8d78b2cc7a2':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Dec 2014 02:18:35 +0000 (02:18 +0000)]
am
51bca143: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
51bca143862c568507206adf119c9003a4f3f764':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Dec 2014 02:18:30 +0000 (02:18 +0000)]
am
d33f84eb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
d33f84eb3e20b781e433d93165d9ff83434d5c99':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Dec 2014 02:18:24 +0000 (02:18 +0000)]
am
fccb3b43: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
fccb3b43a9dfe4dfd3d03119e37b2c99fc95042c':
Import translations. DO NOT MERGE
Michael Wright [Wed, 3 Dec 2014 02:18:19 +0000 (02:18 +0000)]
am
7081a5d1: Merge "Correctly iterate through MediaProjection callbacks." into lmp-mr1-dev
* commit '
7081a5d1ae6b9fe5d92dca25a85524c2c2421e1e':
Correctly iterate through MediaProjection callbacks.
Alan Viverette [Wed, 3 Dec 2014 02:18:12 +0000 (02:18 +0000)]
am
4eb2e04f: Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev
* commit '
4eb2e04f4d3eafdf56840a0988dd730dc433478d':
Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting
Dan Sandler [Wed, 3 Dec 2014 02:18:06 +0000 (02:18 +0000)]
am
dfb39ce3: Merge "Turn off DEBUG_GESTURES" into lmp-mr1-dev
* commit '
dfb39ce332d4256363d1c2a47e68eecd5f144edc':
Turn off DEBUG_GESTURES
George Mount [Wed, 3 Dec 2014 02:17:58 +0000 (02:17 +0000)]
am
561261d4: Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev
* commit '
561261d4442fb78b314c00f6b836fe7b1c387977':
Keep snapshot order matching the shared elements.
Sanket Padawe [Wed, 3 Dec 2014 01:33:42 +0000 (01:33 +0000)]
Merge "Call entitlement on clicking tethering tile in quick settings." into lmp-mr1-dev
Jason Sams [Wed, 3 Dec 2014 01:27:36 +0000 (01:27 +0000)]
Merge "Fix bug in passing of context flags and version." into lmp-mr1-dev
Baligh Uddin [Wed, 3 Dec 2014 01:26:08 +0000 (01:26 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Wed, 3 Dec 2014 01:25:53 +0000 (01:25 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Wed, 3 Dec 2014 01:25:26 +0000 (01:25 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Wed, 3 Dec 2014 01:25:10 +0000 (01:25 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Wed, 3 Dec 2014 01:24:48 +0000 (01:24 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Wed, 3 Dec 2014 01:24:38 +0000 (01:24 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Wed, 3 Dec 2014 01:24:32 +0000 (01:24 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Jason Sams [Wed, 3 Dec 2014 01:24:17 +0000 (17:24 -0800)]
Fix bug in passing of context flags and version.
bug
18592099
Change-Id: Id20906f6f47b573d881025453a3b6356bcf6e9c7
Michael Wright [Wed, 3 Dec 2014 01:14:20 +0000 (01:14 +0000)]
Merge "Correctly iterate through MediaProjection callbacks." into lmp-mr1-dev
Baligh Uddin [Wed, 3 Dec 2014 00:50:24 +0000 (16:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia2ccce90103cdc5e6b3814d50394e9c81e38010d
Auto-generated-cl: translation import
Baligh Uddin [Wed, 3 Dec 2014 00:47:06 +0000 (16:47 -0800)]
Import translations. DO NOT MERGE
Change-Id: I32d37766e97752a7f9479cdf933470978ca3f616
Auto-generated-cl: translation import
Baligh Uddin [Wed, 3 Dec 2014 00:45:14 +0000 (16:45 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id585c5bed5366430b476445a1806748894dd34ac
Auto-generated-cl: translation import
Alan Viverette [Wed, 3 Dec 2014 00:43:46 +0000 (00:43 +0000)]
Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev
Baligh Uddin [Wed, 3 Dec 2014 00:37:24 +0000 (16:37 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7224417957b74eabb5e828d94ad11d89738f1724
Auto-generated-cl: translation import
Baligh Uddin [Wed, 3 Dec 2014 00:32:15 +0000 (16:32 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6d028c94d3ac7df54925008e3cd71973aa9254c9
Auto-generated-cl: translation import
Adam Lesinski [Wed, 3 Dec 2014 00:32:09 +0000 (00:32 +0000)]
am
3550c6c5: am
f17611a2: am
130e30fe: Merge "AAPT: Add custom transition classes to Proguard keep set" into lmp-mr1-dev
* commit '
3550c6c5d67740b8ea77b2921146780fe340f34e':
AAPT: Add custom transition classes to Proguard keep set
Jason Sams [Wed, 3 Dec 2014 00:31:57 +0000 (00:31 +0000)]
am
233d700e: am
b940599a: am
abdaa32d: Merge "Fix bug in passing of context flags and version."
* commit '
233d700efc5f308fe32acc5984b636860e4fc7b0':
Fix bug in passing of context flags and version.
Christopher Tate [Wed, 3 Dec 2014 00:31:52 +0000 (00:31 +0000)]
am
f83fa5fe: am
f9221a10: am
3bec5090: Merge "Properly recognize repeating wakeup alarms" into lmp-mr1-dev
* commit '
f83fa5fee60f449db0591661471581b8ce128439':
Properly recognize repeating wakeup alarms
Christopher Tate [Wed, 3 Dec 2014 00:31:46 +0000 (00:31 +0000)]
am
953e90d0: am
f246b484: am
99391361: Merge "Midnight should mean midnight" into lmp-mr1-dev
* commit '
953e90d0d77b050020fcdfae5b857108adb92102':
Midnight should mean midnight
Alan Viverette [Wed, 3 Dec 2014 00:31:39 +0000 (00:31 +0000)]
am
42b678b3: am
fa173e0c: am
d72901f0: Merge "Update drawable container constant state following clone" into lmp-mr1-dev
* commit '
42b678b3d7c10d6986aea82ec72e1b36f243972a':
Update drawable container constant state following clone
Alan Viverette [Wed, 3 Dec 2014 00:31:33 +0000 (00:31 +0000)]
am
6c23ba0d: am
a6779bc5: am
9a888816: Merge "Deprecate one-arg getDrawableForDensity, update currents.txt" into lmp-mr1-dev
* commit '
6c23ba0d8d39aed98197071c7cf9ffc0b6c633b5':
Deprecate one-arg getDrawableForDensity, update currents.txt
Svetoslav [Wed, 3 Dec 2014 00:31:23 +0000 (00:31 +0000)]
am
935702b6: am
95482c28: am
cdd3356d: Merge "Allow more space for the printer spinner to avoid truncation." into lmp-mr1-dev
* commit '
935702b6d5873d028c5f5c0e35e46a35b5e11a22':
Allow more space for the printer spinner to avoid truncation.
Alan Viverette [Wed, 3 Dec 2014 00:31:13 +0000 (00:31 +0000)]
am
0cd6296c: am
63c7a655: am
1b33396e: Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev
* commit '
0cd6296c0afb92f63487247ef4c9c73715113926':
Deprecate Resources.getDrawable(int) in favor of the two-arg version
Ricardo Cervera [Wed, 3 Dec 2014 00:31:07 +0000 (00:31 +0000)]
am
24d40b30: am
ce9936a8: am
152470a2: am
8c71df8d: am
f9b8bd5e: am
6ee2ca2f: docs: Long press to dismiss fix by Wayne
* commit '
24d40b302e5dabc6c435b6549ef5801540edfca8':
docs: Long press to dismiss fix by Wayne
Adam Lesinski [Wed, 3 Dec 2014 00:30:56 +0000 (00:30 +0000)]
am
9438ad15: am
e580d661: am
e89a2865: Merge changes If2c7e09f,Ie21f227c
* commit '
9438ad1599716176fb6c593e77a2e93b265bbcb5':
RRO idmap: pad with 0xffffffff, not 0x00000000
RRO: reintroduce lost ResTable insert of assets
Chris Wren [Wed, 3 Dec 2014 00:30:44 +0000 (00:30 +0000)]
am
723bce8a: am
47a5cb12: am
acd01ff0: Merge "Keep deleteIntent when copying Notification attributes"
* commit '
723bce8a0d4fa900ca4344c03e5e82b5881fcf19':
Keep deleteIntent when copying Notification attributes
Baligh Uddin [Wed, 3 Dec 2014 00:30:35 +0000 (00:30 +0000)]
am
97267def: (-s ours) am
e3a16016: (-s ours) am
92ad4dd0: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
97267def8219d6ad3d8a96449b08653ae1bd6832':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Dec 2014 00:30:30 +0000 (00:30 +0000)]
am
52632ad8: (-s ours) am
74724945: (-s ours) am
fccaa58c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
52632ad881c96e785518e18fde1a72e6f6e25a42':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Dec 2014 00:30:26 +0000 (00:30 +0000)]
am
3b027a37: (-s ours) am
3bcc97e7: (-s ours) am
6774911e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
3b027a374e6e8ba084b6dcfcdbf81ee581e20517':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Dec 2014 00:30:22 +0000 (00:30 +0000)]
am
e105a70a: (-s ours) am
261db4f3: (-s ours) am
30460ae3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
e105a70ae1dcfdbca15e188f27d7d3a1bea788d2':
Import translations. DO NOT MERGE
Jinsuk Kim [Wed, 3 Dec 2014 00:30:08 +0000 (00:30 +0000)]
am
eb6c6d63: am
566d15f6: am
fb020862: Merge "CEC: Set the parameter of <System Audio Mode Request> right" into lmp-mr1-dev
* commit '
eb6c6d634774d85eceac135a91fdeaf3a884152e':
CEC: Set the parameter of <System Audio Mode Request> right
Baligh Uddin [Wed, 3 Dec 2014 00:30:05 +0000 (16:30 -0800)]
Import translations. DO NOT MERGE
Change-Id: I91311501af2edb114e6db77786fcefaa6d26db3a
Auto-generated-cl: translation import
Alan Viverette [Wed, 3 Dec 2014 00:29:46 +0000 (00:29 +0000)]
am
73d28900: resolved conflicts for merge of
850cdbe5 to lmp-mr1-dev-plus-aosp
* commit '
73d28900e96b84b2833954669f1db95326f3d6e0':
Consider RTL layout in DPAD navigation in AbsSeekBar
Craig Mautner [Wed, 3 Dec 2014 00:29:30 +0000 (00:29 +0000)]
am
61a7b7cf: am
e4e7d2cd: am
41ec0400: Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev
* commit '
61a7b7cff57dc66a1f64c9d7519fc1f6844b6915':
Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED
Stuart Scott [Wed, 3 Dec 2014 00:29:21 +0000 (00:29 +0000)]
am
cc4cd6e1: am
15b2d9ab: am
4e779ecd: Merge "Subscription Info density-dependent text size and localized SIM slot index" into lmp-mr1-dev
* commit '
cc4cd6e1abe81d1edda7f1489dbd26298d38a699':
Subscription Info density-dependent text size and localized SIM slot index
Baligh Uddin [Wed, 3 Dec 2014 00:28:12 +0000 (16:28 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5615709624d61d837bd562cc5bb4c454ef983527
Auto-generated-cl: translation import
Alan Viverette [Wed, 3 Dec 2014 00:24:24 +0000 (16:24 -0800)]
Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting
Using CURRENT isn't always safe.
BUG:
18557273
Change-Id: I12e197ab25b8ffdc04c5e74836945177870698a2
Nick Kralevich [Wed, 3 Dec 2014 00:22:57 +0000 (16:22 -0800)]
resolved conflicts for merge of
ef9b1643 to master
Change-Id: Ifcde272f882e55998b16e02cca1e827dec35ce6f
Dan Sandler [Wed, 3 Dec 2014 00:22:17 +0000 (00:22 +0000)]
Merge "Turn off DEBUG_GESTURES" into lmp-mr1-dev
George Mount [Wed, 3 Dec 2014 00:13:27 +0000 (00:13 +0000)]
Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev
Adam Lesinski [Wed, 3 Dec 2014 00:05:33 +0000 (00:05 +0000)]
am
f17611a2: am
130e30fe: Merge "AAPT: Add custom transition classes to Proguard keep set" into lmp-mr1-dev
* commit '
f17611a29e3b0d0c7a5d28a1ce92682a2c097de6':
AAPT: Add custom transition classes to Proguard keep set
Jason Sams [Wed, 3 Dec 2014 00:00:21 +0000 (00:00 +0000)]
am
b940599a: am
abdaa32d: Merge "Fix bug in passing of context flags and version."
* commit '
b940599a750e3ee50934c57b6a22841627be2d2e':
Fix bug in passing of context flags and version.
Adam Lesinski [Tue, 2 Dec 2014 23:57:12 +0000 (23:57 +0000)]
am
130e30fe: Merge "AAPT: Add custom transition classes to Proguard keep set" into lmp-mr1-dev
* commit '
130e30fe247c85aeb777a0f60b31885fef613930':
AAPT: Add custom transition classes to Proguard keep set
Christopher Tate [Tue, 2 Dec 2014 23:56:58 +0000 (23:56 +0000)]
am
f9221a10: am
3bec5090: Merge "Properly recognize repeating wakeup alarms" into lmp-mr1-dev
* commit '
f9221a1076203832d8d88a8720c12cad91aee906':
Properly recognize repeating wakeup alarms
Christopher Tate [Tue, 2 Dec 2014 23:56:52 +0000 (23:56 +0000)]
am
f246b484: am
99391361: Merge "Midnight should mean midnight" into lmp-mr1-dev
* commit '
f246b484c5cf8b63e1b700d17e8161f566e3f5d7':
Midnight should mean midnight
Jason Sams [Tue, 2 Dec 2014 23:52:12 +0000 (23:52 +0000)]
am
abdaa32d: Merge "Fix bug in passing of context flags and version."
* commit '
abdaa32dd79c915d0e419560c8eaa64e3d946b77':
Fix bug in passing of context flags and version.
Adam Lesinski [Tue, 2 Dec 2014 23:50:49 +0000 (23:50 +0000)]
Merge "AAPT: Add custom transition classes to Proguard keep set" into lmp-mr1-dev
Christopher Tate [Tue, 2 Dec 2014 23:48:31 +0000 (23:48 +0000)]
am
3bec5090: Merge "Properly recognize repeating wakeup alarms" into lmp-mr1-dev
* commit '
3bec50908b8438c04a654a3bb806f05a01402ce7':
Properly recognize repeating wakeup alarms
Christopher Tate [Tue, 2 Dec 2014 23:48:26 +0000 (23:48 +0000)]
am
99391361: Merge "Midnight should mean midnight" into lmp-mr1-dev
* commit '
99391361217cd9234ddc0570055677863cb6fb34':
Midnight should mean midnight
Alan Viverette [Tue, 2 Dec 2014 23:45:31 +0000 (23:45 +0000)]
am
fa173e0c: am
d72901f0: Merge "Update drawable container constant state following clone" into lmp-mr1-dev
* commit '
fa173e0c65219e56625c22b0ac482354d924bcd8':
Update drawable container constant state following clone
Alan Viverette [Tue, 2 Dec 2014 23:45:25 +0000 (23:45 +0000)]
am
a6779bc5: am
9a888816: Merge "Deprecate one-arg getDrawableForDensity, update currents.txt" into lmp-mr1-dev
* commit '
a6779bc51772aae2ba4cc94db2ae47b76a2cc972':
Deprecate one-arg getDrawableForDensity, update currents.txt
Jason Sams [Tue, 2 Dec 2014 23:45:16 +0000 (23:45 +0000)]
Merge "Fix bug in passing of context flags and version."
Christopher Tate [Tue, 2 Dec 2014 23:44:18 +0000 (23:44 +0000)]
Merge "Properly recognize repeating wakeup alarms" into lmp-mr1-dev
OSDN Git Service
