Kevin Neas
28c7363e8d
Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev am: 4dbb586585 am: b6ae32162e
...
am: 32a7d85f64
* commit '32a7d85f64a193745de81ee94b7b4d7adefb3f02':
DO NOT MERGE. Cherrypick UiBench from Master
2015-11-24 02:54:07 +00:00
Kevin Neas
32a7d85f64
Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev am: 4dbb586585
...
am: b6ae32162e
* commit 'b6ae32162e77d9f11620b6806dec20a0987e2dab':
DO NOT MERGE. Cherrypick UiBench from Master
2015-11-24 02:46:24 +00:00
Kevin Neas
b6ae32162e
Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev
...
am: 4dbb586585
* commit '4dbb58658552d1cdae46ef06d331b867f5610786':
DO NOT MERGE. Cherrypick UiBench from Master
2015-11-24 01:58:00 +00:00
Kevin Neas
4dbb586585
Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev
2015-11-24 00:50:18 +00:00
Geoff Mendal
3ed855b01a
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
...
am: d273c053ce -s ours
* commit 'd273c053ce85585d223d152bacf6e9e4c6859d1e':
Import translations. DO NOT MERGE
2015-11-23 17:58:21 +00:00
Geoff Mendal
d273c053ce
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
2015-11-23 17:51:14 +00:00
Geoff Mendal
fa49e87f5e
Import translations. DO NOT MERGE
...
Change-Id: I6553e9e4da9e5e5c33aad42aa215d8d328f66509
Auto-generated-cl: translation import
2015-11-23 18:50:05 +01:00
Geoff Mendal
4b66f74aae
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: ae7c51a9cc -s ours
...
am: 57b3e7508d -s ours
* commit '57b3e7508d1adb81cbe3b5aff24fbaaa71de9ce2':
Import translations. DO NOT MERGE
2015-11-23 17:46:15 +00:00
Geoff Mendal
57b3e7508d
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
...
am: ae7c51a9cc -s ours
* commit 'ae7c51a9ccf1bc1030b33a64b095a4fe3b06a3bd':
Import translations. DO NOT MERGE
2015-11-23 17:38:52 +00:00
Geoff Mendal
ae7c51a9cc
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
2015-11-23 17:32:02 +00:00
Geoff Mendal
2542f81bb1
Import translations. DO NOT MERGE
...
Change-Id: I000a0799900cec827d9df803e0aa6e0fdb28b236
Auto-generated-cl: translation import
2015-11-23 18:30:39 +01:00
Geoff Mendal
e309a7f951
Import translations. DO NOT MERGE am: b21b778567 -s ours am: b96f640a77 -s ours
...
am: 816a167b29 -s ours
* commit '816a167b2936a420d96f57f57005982e727745f5':
Import translations. DO NOT MERGE
2015-11-23 13:51:05 +00:00
Geoff Mendal
816a167b29
Import translations. DO NOT MERGE am: b21b778567 -s ours
...
am: b96f640a77 -s ours
* commit 'b96f640a77b0c09868e104028d3bb9db3687018b':
Import translations. DO NOT MERGE
2015-11-23 13:43:48 +00:00
Geoff Mendal
b96f640a77
Import translations. DO NOT MERGE
...
am: b21b778567 -s ours
* commit 'b21b7785678f08e939dbe2e7d7cb5eedae47e1c4':
Import translations. DO NOT MERGE
2015-11-23 13:36:02 +00:00
Geoff Mendal
b21b778567
Import translations. DO NOT MERGE
...
Change-Id: Id46055ddba8834518c0faf5e0dd95d883dd79542
Auto-generated-cl: translation import
2015-11-23 14:26:59 +01:00
Adam Lesinski
6cd5beed50
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing am: 6902052c77 -s ours am: 888916ff0f -s ours
...
am: 29db6ccb72 -s ours
* commit '29db6ccb72b1b43568f2045825cf5435bd661e00':
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
2015-11-20 20:27:01 +00:00
Adam Lesinski
29db6ccb72
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing am: 6902052c77 -s ours
...
am: 888916ff0f -s ours
* commit '888916ff0ff51e35a77bd05ecbaeecb8d6e95585':
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
2015-11-20 20:20:14 +00:00
Adam Lesinski
888916ff0f
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
...
am: 6902052c77 -s ours
* commit '6902052c77bbcb9078b4ced243874f67542f64f9':
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
2015-11-20 20:14:08 +00:00
Adam Lesinski
6902052c77
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
...
We introduced some new flag at the lowest significant bit of the
battery level int but failed to account for it when unpacking.
Bug:25596467
Change-Id: I4320e6fcc208ec6de249b14fe3e399ab2f32d839
2015-11-20 10:58:02 -08:00
Chris Tate
96333c2e8c
Merge "Don\'t back up / restore EAP network definitions" am: 14a0981fde
...
am: b5a38f6da5
* commit 'b5a38f6da5f59020e2c32e00d7228ed71c18f70d':
Don't back up / restore EAP network definitions
2015-11-20 18:10:21 +00:00
Chris Tate
b5a38f6da5
Merge "Don\'t back up / restore EAP network definitions"
...
am: 14a0981fde
* commit '14a0981fdef45967b19c3db4fb2f298c8b5a1f7c':
Don't back up / restore EAP network definitions
2015-11-20 18:05:04 +00:00
Chris Tate
14a0981fde
Merge "Don't back up / restore EAP network definitions"
2015-11-20 18:01:10 +00:00
Geoff Mendal
4943634c10
Import translations. DO NOT MERGE am: bddde9b83d -s ours am: d0709c3a32 -s ours am: 1bd58bfd5b -s ours am: fd773d1ba7 -s ours
...
am: b1a5fef946 -s ours
* commit 'b1a5fef946bf5ec1c9bb59696cad9534ba72190b':
Import translations. DO NOT MERGE
2015-11-20 01:56:21 +00:00
Deepanshu Gupta
adca23bb4c
Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev am: 35f7562495 am: 2d887558df
...
am: 0627cd0c40
* commit '0627cd0c404838a0251ee359ed75041f430fa83b':
Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""
2015-11-20 01:55:01 +00:00
Deepanshu Gupta
138a901db4
Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev am: 8c971ae5a0 am: 867c370465
...
am: 4d9df358ec
* commit '4d9df358ec847262872c09962105537be350f8fd':
Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
2015-11-20 01:53:43 +00:00
Sreeram Ramachandran
9ebdd27142
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 am: 33c1718205 am: b776891801 am: 974f805500 am: 6d983179a0 am: 5d41bd8d1a am: c1552f0caf
...
am: 38a3b2154c
* commit '38a3b2154c7ee5d75b5670abaa4c154edd3c36eb':
Don't use framework permission strings for netd permissions.
2015-11-20 01:52:25 +00:00
Vineeta Srivastava
8e8c12acfa
Merge "Fix MVNO hotspot bug for Europe" into mnc-dr1.5-dev am: 013c7daedd
...
am: cb948af246
* commit 'cb948af2469ca3869d368c0162dd459912afb0b9':
Fix MVNO hotspot bug for Europe
2015-11-20 01:51:01 +00:00
Geoff Mendal
b1a5fef946
Import translations. DO NOT MERGE am: bddde9b83d -s ours am: d0709c3a32 -s ours am: 1bd58bfd5b -s ours
...
am: fd773d1ba7 -s ours
* commit 'fd773d1ba76c29b8888c71906ef44ec09a551627':
Import translations. DO NOT MERGE
2015-11-20 01:40:42 +00:00
Geoff Mendal
fd773d1ba7
Import translations. DO NOT MERGE am: bddde9b83d -s ours am: d0709c3a32 -s ours
...
am: 1bd58bfd5b -s ours
* commit '1bd58bfd5bab7f517de41ec17342d0710c64ad9a':
Import translations. DO NOT MERGE
2015-11-20 01:30:35 +00:00
Geoff Mendal
1bd58bfd5b
Import translations. DO NOT MERGE am: bddde9b83d -s ours
...
am: d0709c3a32 -s ours
* commit 'd0709c3a329ce555d9d968bc1808fec5bcc1fb10':
Import translations. DO NOT MERGE
2015-11-20 01:25:11 +00:00
Geoff Mendal
d0709c3a32
Import translations. DO NOT MERGE
...
am: bddde9b83d -s ours
* commit 'bddde9b83db2bab9343cbe107d3672fea5314d4b':
Import translations. DO NOT MERGE
2015-11-20 01:15:04 +00:00
Geoff Mendal
bddde9b83d
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I0ab6836c1cf116a76b9ece6722e2f3dfe2d4bfe2
2015-11-20 01:07:33 +00:00
Guang Zhu
723462eba9
add lost RAM info to compact meminfo dump am: 877c6c7742
...
am: b681ec0219
* commit 'b681ec02194039768767215b2479507742288c98':
add lost RAM info to compact meminfo dump
2015-11-20 00:01:31 +00:00
Alex Deymo
f7d10eca49
Merge "Remove the aidl tool" into mnc-dr2-dev
...
am: 8d31b08904
* commit '8d31b089040dafefee16033176a884d43e259804':
Remove the aidl tool
2015-11-19 23:50:25 +00:00
Deepanshu Gupta
0627cd0c40
Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev am: 35f7562495
...
am: 2d887558df
* commit '2d887558dfa0b46fde5663fb494e2230febeaccc':
Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""
2015-11-19 21:10:57 +00:00
Deepanshu Gupta
4d9df358ec
Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev am: 8c971ae5a0
...
am: 867c370465
* commit '867c3704652d40118b47e9c97149e7fd9567a16b':
Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
2015-11-19 21:09:24 +00:00
Deepanshu Gupta
2d887558df
Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev
...
am: 35f7562495
* commit '35f75624958bc061764c7cc71843ca7ea60c0666':
Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""
2015-11-19 21:00:17 +00:00
Deepanshu Gupta
867c370465
Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev
...
am: 8c971ae5a0
* commit '8c971ae5a0d294175481426d4543e23dc8d4a349':
Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
2015-11-19 20:58:52 +00:00
Deepanshu Gupta
35f7562495
Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev
2015-11-19 20:49:55 +00:00
Deepanshu Gupta
66098964e2
Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""
...
This reverts commit 65a834980cdbb9407a3f27e48cd0a8c472182cd6.
The original revert was only for cherry-pick to release
branch.
Change-Id: Ib78f9a06ce49681c767f65b262058f18a670e38e
2015-11-19 20:49:35 +00:00
Deepanshu Gupta
8c971ae5a0
Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev
2015-11-19 20:48:52 +00:00
Deepanshu Gupta
65a834980c
Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
...
This reverts commit 631c2ffd6ff1bfa7463d29a39a7ee74be019b3f9.
The revert is only for cherry-pick back to mnc-sdk-release.
Change-Id: I42cb392528b7890b58d689c732f90c3b9ba5f74c
2015-11-19 20:47:26 +00:00
Sreeram Ramachandran
38a3b2154c
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 am: 33c1718205 am: b776891801 am: 974f805500 am: 6d983179a0 am: 5d41bd8d1a
...
am: c1552f0caf
* commit 'c1552f0caf26bc79e5de6fdd15aa97900d6fd4aa':
Don't use framework permission strings for netd permissions.
2015-11-19 17:30:05 +00:00
Sreeram Ramachandran
c1552f0caf
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 am: 33c1718205 am: b776891801 am: 974f805500 am: 6d983179a0
...
am: 5d41bd8d1a
* commit '5d41bd8d1acd894cef1aff9018614194df6f95ab':
Don't use framework permission strings for netd permissions.
2015-11-19 17:20:09 +00:00
Sreeram Ramachandran
5d41bd8d1a
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 am: 33c1718205 am: b776891801 am: 974f805500
...
am: 6d983179a0
* commit '6d983179a047ff0e69fc06c06d3b9b06c32406ae':
Don't use framework permission strings for netd permissions.
2015-11-19 17:10:45 +00:00
Sreeram Ramachandran
6d983179a0
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 am: 33c1718205 am: b776891801
...
am: 974f805500
* commit '974f8055005a3d75e45cab89badd9ef183a75107':
Don't use framework permission strings for netd permissions.
2015-11-19 16:59:45 +00:00
Sreeram Ramachandran
974f805500
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 am: 33c1718205
...
am: b776891801
* commit 'b7768918014d34c2e4d74abefeb03956aee421fc':
Don't use framework permission strings for netd permissions.
2015-11-19 16:50:11 +00:00
Sreeram Ramachandran
b776891801
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790
...
am: 33c1718205
* commit '33c17182058ce0f9d0bae48467827ff52422cdd2':
Don't use framework permission strings for netd permissions.
2015-11-19 16:40:35 +00:00
Sreeram Ramachandran
33c1718205
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7
...
am: d3b6e2d790
* commit 'd3b6e2d790f95f2fb3d85f0993b90bb8708a6114':
Don't use framework permission strings for netd permissions.
2015-11-19 16:30:59 +00:00
Sreeram Ramachandran
d3b6e2d790
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd
...
am: 42faa221d7
* commit '42faa221d7e8bc6db32698b3528e9c5898dbb943':
Don't use framework permission strings for netd permissions.
2015-11-19 16:20:26 +00:00
