OSDN Git Service
Robin Lee [Fri, 10 Jul 2015 19:55:12 +0000 (19:55 +0000)]
am
be638020: am
719cbc4a: am
d3b6832e: am
7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
* commit '
be638020e55c29b0b283713fb42c9866960b5755':
Match getLegacyVpn calls to changed interface
Robin Lee [Fri, 10 Jul 2015 19:41:01 +0000 (19:41 +0000)]
am
719cbc4a: am
d3b6832e: am
7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
* commit '
719cbc4acfe01d3aaf0dfb1061c06b69b7db2d29':
Match getLegacyVpn calls to changed interface
Rubin Xu [Fri, 10 Jul 2015 19:33:00 +0000 (19:33 +0000)]
am
bd2e045e: am
a383b02c: am
8b9a9519: am
331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev
* commit '
bd2e045e177c831925653ee43b18196c130e22e3':
Remove unused MediaFormat activity
Jason Monk [Fri, 10 Jul 2015 19:32:58 +0000 (19:32 +0000)]
am
8b35321f: am
93623850: am
c07450ae: am
7ab3cf94: Merge "Fix wifi not re-ordering" into mnc-dev
* commit '
8b35321fa288bf6ef61099d0ed0f48956f979807':
Fix wifi not re-ordering
Rubin Xu [Fri, 10 Jul 2015 19:26:09 +0000 (19:26 +0000)]
am
a383b02c: am
8b9a9519: am
331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev
* commit '
a383b02c431de7b68f8f913ecfeca9f0051122fe':
Remove unused MediaFormat activity
Robin Lee [Fri, 10 Jul 2015 19:26:09 +0000 (19:26 +0000)]
am
d3b6832e: am
7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
* commit '
d3b6832edb5530b23132e054135c7fe93f5f9384':
Match getLegacyVpn calls to changed interface
Jason Monk [Fri, 10 Jul 2015 19:18:01 +0000 (19:18 +0000)]
am
93623850: am
c07450ae: am
7ab3cf94: Merge "Fix wifi not re-ordering" into mnc-dev
* commit '
9362385095374cc40cc4549d16e913831e9f14d9':
Fix wifi not re-ordering
Robin Lee [Fri, 10 Jul 2015 19:16:57 +0000 (19:16 +0000)]
am
7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
* commit '
7ba46433aefad363a1d2e75d4a12f2886c6d0315':
Match getLegacyVpn calls to changed interface
Rubin Xu [Fri, 10 Jul 2015 19:16:48 +0000 (19:16 +0000)]
am
8b9a9519: am
331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev
* commit '
8b9a9519c865d73ce10a5847b3b99b3cd339114e':
Remove unused MediaFormat activity
Robin Lee [Fri, 10 Jul 2015 19:05:36 +0000 (19:05 +0000)]
Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
Jason Monk [Fri, 10 Jul 2015 19:04:47 +0000 (19:04 +0000)]
am
c07450ae: am
7ab3cf94: Merge "Fix wifi not re-ordering" into mnc-dev
* commit '
c07450ae7449dd995499dd7cfd5c9367914d6b95':
Fix wifi not re-ordering
Rubin Xu [Fri, 10 Jul 2015 19:03:19 +0000 (19:03 +0000)]
am
331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev
* commit '
331b9823d0a686d414f181ed406181d1d4e2aa1a':
Remove unused MediaFormat activity
Jason Monk [Fri, 10 Jul 2015 18:48:32 +0000 (18:48 +0000)]
am
7ab3cf94: Merge "Fix wifi not re-ordering" into mnc-dev
* commit '
7ab3cf944dd8c120555dada4fc490a9fe592f37e':
Fix wifi not re-ordering
Rubin Xu [Fri, 10 Jul 2015 18:47:49 +0000 (18:47 +0000)]
Merge "Remove unused MediaFormat activity" into mnc-dev
Jason Monk [Fri, 10 Jul 2015 18:37:19 +0000 (18:37 +0000)]
Merge "Fix wifi not re-ordering" into mnc-dev
Jason Monk [Fri, 10 Jul 2015 17:42:35 +0000 (13:42 -0400)]
Fix wifi not re-ordering
Bug:
22361247
Change-Id: I5c25061735628682741060c8a699c0a977c4351b
Julia Reynolds [Fri, 10 Jul 2015 17:28:08 +0000 (17:28 +0000)]
am
1d595713: am
5a8b507e: am
a368f9a9: am
ddd887af: Prevent crash when removing an account.
* commit '
1d5957134ddf1add6ffd4f3fc947440402290fca':
Prevent crash when removing an account.
Julia Reynolds [Fri, 10 Jul 2015 17:14:42 +0000 (17:14 +0000)]
am
5a8b507e: am
a368f9a9: am
ddd887af: Prevent crash when removing an account.
* commit '
5a8b507e346b12cb76d3b2f0069da1310f409846':
Prevent crash when removing an account.
Julia Reynolds [Fri, 10 Jul 2015 17:06:34 +0000 (17:06 +0000)]
am
a368f9a9: am
ddd887af: Prevent crash when removing an account.
* commit '
a368f9a97405b6358515186614cd9f450119f937':
Prevent crash when removing an account.
Julia Reynolds [Fri, 10 Jul 2015 16:51:37 +0000 (16:51 +0000)]
am
ddd887af: Prevent crash when removing an account.
* commit '
ddd887afc826b82b37ca8bd43c847479c94c07aa':
Prevent crash when removing an account.
Julia Reynolds [Fri, 10 Jul 2015 14:07:21 +0000 (10:07 -0400)]
Prevent crash when removing an account.
Bug:
21164141
Change-Id: Ib7cee6d8478b49339fd3477e2369da15069f9c3f
Rubin Xu [Thu, 9 Jul 2015 20:01:08 +0000 (21:01 +0100)]
Remove unused MediaFormat activity
As part of cleanup of ExternalStorageFormatter.
Bug:
9433509
Change-Id: I4d2bca544e00a549d8c136713da59d07648b9ffe
Julia Reynolds [Thu, 9 Jul 2015 19:53:46 +0000 (19:53 +0000)]
am
e10b32ba: am
1bde3259: am
df778e8e: am
963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-dev
* commit '
e10b32ba414419c80d86d4105ddbfc14006290a9':
Talkback improvements for Settings screens.
Jason Monk [Thu, 9 Jul 2015 19:53:44 +0000 (19:53 +0000)]
am
92b4f9a3: am
0f24766c: am
cfd4b754: am
5c3b7c3a: Merge "Don\'t clear data summary when loader is cancelled" into mnc-dev
* commit '
92b4f9a3d4d60c2085a7dcbef8c73051efa5ca78':
Don't clear data summary when loader is cancelled
Jason Monk [Thu, 9 Jul 2015 19:53:43 +0000 (19:53 +0000)]
am
eb96e6ab: am
f2a3b6a0: am
e60ad922: am
b6b85325: Merge "Fix rotation issues" into mnc-dev
* commit '
eb96e6ab434c7f94d47404c9f0521d86e40c25e3':
Fix rotation issues
Julia Reynolds [Thu, 9 Jul 2015 19:40:31 +0000 (19:40 +0000)]
am
1bde3259: am
df778e8e: am
963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-dev
* commit '
1bde32596441375f41b9653eb22b22b3df915ebe':
Talkback improvements for Settings screens.
Jason Monk [Thu, 9 Jul 2015 19:40:29 +0000 (19:40 +0000)]
am
0f24766c: am
cfd4b754: am
5c3b7c3a: Merge "Don\'t clear data summary when loader is cancelled" into mnc-dev
* commit '
0f24766c9a23c4e3011206ae7e946faa1224e655':
Don't clear data summary when loader is cancelled
Jason Monk [Thu, 9 Jul 2015 19:40:28 +0000 (19:40 +0000)]
am
f2a3b6a0: am
e60ad922: am
b6b85325: Merge "Fix rotation issues" into mnc-dev
* commit '
f2a3b6a05d97264ac607a7cc898a4797c7fea031':
Fix rotation issues
Julia Reynolds [Thu, 9 Jul 2015 19:25:24 +0000 (19:25 +0000)]
am
df778e8e: am
963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-dev
* commit '
df778e8e76ca41c517385b8c30a468eecc37d107':
Talkback improvements for Settings screens.
Jason Monk [Thu, 9 Jul 2015 19:25:22 +0000 (19:25 +0000)]
am
cfd4b754: am
5c3b7c3a: Merge "Don\'t clear data summary when loader is cancelled" into mnc-dev
* commit '
cfd4b754886534418d378d4065200c14844f2b09':
Don't clear data summary when loader is cancelled
Jason Monk [Thu, 9 Jul 2015 19:25:19 +0000 (19:25 +0000)]
am
e60ad922: am
b6b85325: Merge "Fix rotation issues" into mnc-dev
* commit '
e60ad922de334286cfd36c7f3939d34096e69049':
Fix rotation issues
Julia Reynolds [Thu, 9 Jul 2015 19:09:25 +0000 (19:09 +0000)]
am
963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-dev
* commit '
963e3fdd05156bb11e6692222b2d08b34c7d126b':
Talkback improvements for Settings screens.
Jason Monk [Thu, 9 Jul 2015 19:09:23 +0000 (19:09 +0000)]
am
5c3b7c3a: Merge "Don\'t clear data summary when loader is cancelled" into mnc-dev
* commit '
5c3b7c3adefe27bf0a91eba8318048b677d276eb':
Don't clear data summary when loader is cancelled
Jason Monk [Thu, 9 Jul 2015 19:09:21 +0000 (19:09 +0000)]
am
b6b85325: Merge "Fix rotation issues" into mnc-dev
* commit '
b6b85325e91a3e22dd23d67241adecc359dc0952':
Fix rotation issues
Zoltan Szatmary-Ban [Thu, 9 Jul 2015 19:08:52 +0000 (19:08 +0000)]
am
97c58230: am
64f55c4f: am
381adf9e: am
ee77eced: Merge "Check signature match between Cert installer and Settings" into mnc-dev
* commit '
97c582300cffb2d8271b09ebc310ffc8741c4267':
Check signature match between Cert installer and Settings
Julia Reynolds [Thu, 9 Jul 2015 18:57:23 +0000 (18:57 +0000)]
Merge "Talkback improvements for Settings screens." into mnc-dev
Jason Monk [Thu, 9 Jul 2015 18:55:07 +0000 (18:55 +0000)]
Merge "Don't clear data summary when loader is cancelled" into mnc-dev
Jason Monk [Thu, 9 Jul 2015 18:55:03 +0000 (18:55 +0000)]
Merge "Fix rotation issues" into mnc-dev
Zoltan Szatmary-Ban [Thu, 9 Jul 2015 18:50:22 +0000 (18:50 +0000)]
am
64f55c4f: am
381adf9e: am
ee77eced: Merge "Check signature match between Cert installer and Settings" into mnc-dev
* commit '
64f55c4ffb8006bf982a9ca2617cfca1a140e9d9':
Check signature match between Cert installer and Settings
Zoltan Szatmary-Ban [Thu, 9 Jul 2015 18:00:03 +0000 (18:00 +0000)]
am
381adf9e: am
ee77eced: Merge "Check signature match between Cert installer and Settings" into mnc-dev
* commit '
381adf9ea9b10e96cd0a13bee98fc26ba4566a4d':
Check signature match between Cert installer and Settings
Zoltan Szatmary-Ban [Thu, 9 Jul 2015 17:49:56 +0000 (17:49 +0000)]
am
ee77eced: Merge "Check signature match between Cert installer and Settings" into mnc-dev
* commit '
ee77eced69fac3e6f94cbb3ce2013d8334c17c90':
Check signature match between Cert installer and Settings
Zoltan Szatmary-Ban [Thu, 9 Jul 2015 17:33:22 +0000 (17:33 +0000)]
Merge "Check signature match between Cert installer and Settings" into mnc-dev
Julia Reynolds [Wed, 8 Jul 2015 20:56:31 +0000 (16:56 -0400)]
Talkback improvements for Settings screens.
Bug:
21164141
Change-Id: I7444261ccf967f6db70c9fe44a00bd3f19ceb975
Zoltan Szatmary-Ban [Thu, 9 Jul 2015 16:30:20 +0000 (17:30 +0100)]
Check signature match between Cert installer and Settings
To prevent an app masquerading as com.android.certinstaller install
malicious certs.
Bug:
22095968
Change-Id: Ia79f326af0f39a23b687cb08981920665669e0a1
Zoltan Szatmary-Ban [Thu, 9 Jul 2015 15:53:00 +0000 (15:53 +0000)]
am
4dc5b67c: am
b8254212: am
325ba385: am
4bbe3d1f: Update all shown preferences in Settings > Storage
* commit '
4dc5b67c1280c7e8d83b99ba5671b58ae95a77ec':
Update all shown preferences in Settings > Storage
Zoltan Szatmary-Ban [Thu, 9 Jul 2015 15:40:29 +0000 (15:40 +0000)]
am
b8254212: am
325ba385: am
4bbe3d1f: Update all shown preferences in Settings > Storage
* commit '
b82542122e9b7b6e91fdc04956b81853db845255':
Update all shown preferences in Settings > Storage
Zoltan Szatmary-Ban [Thu, 9 Jul 2015 15:27:39 +0000 (15:27 +0000)]
am
325ba385: am
4bbe3d1f: Update all shown preferences in Settings > Storage
* commit '
325ba38595f079a09a5c5fe4a18e35ad6dd24ee5':
Update all shown preferences in Settings > Storage
Jason Monk [Thu, 9 Jul 2015 15:22:26 +0000 (11:22 -0400)]
Don't clear data summary when loader is cancelled
Keep whatever summary we had before.
Bug:
22351861
Change-Id: Id2088404f09dcadce1cbf2959918956844d613a7
Zoltan Szatmary-Ban [Thu, 9 Jul 2015 15:14:32 +0000 (15:14 +0000)]
am
4bbe3d1f: Update all shown preferences in Settings > Storage
* commit '
4bbe3d1fb66a99bfdf4cad8f2e77df23dccebbbd':
Update all shown preferences in Settings > Storage
Zoltan Szatmary-Ban [Thu, 9 Jul 2015 14:37:26 +0000 (15:37 +0100)]
Update all shown preferences in Settings > Storage
This is achieved by iterating through the pool of StorageItemPreferences up
to the index of the last shown one, instead of iterating through the
preferences of the screen which may miss preferences inside other top-level
preference groups.
Bug:
22353561
Change-Id: I2293a7949a5becfb506d6b7965f8db2f11845756
Jason Monk [Thu, 9 Jul 2015 14:33:58 +0000 (10:33 -0400)]
Fix rotation issues
Bug:
22373905
Bug:
22311581
Change-Id: Idbed99a3fc0cc64047da151be166ee0ea4c1fb3d
Sasha Levitskiy [Thu, 9 Jul 2015 00:40:59 +0000 (00:40 +0000)]
am
4a2e8fed: am
2e97520e: am
49abf5f4: am
93b1a5a9: Merge "Fingerprint: Add post enroll call" into mnc-dev
* commit '
4a2e8fed1a4f86139e3c40dfff9c7e75a8d96f40':
Fingerprint: Add post enroll call
Tim Kilbourn [Thu, 9 Jul 2015 00:40:58 +0000 (00:40 +0000)]
am
5cf37f71: am
8170e7a4: am
5ffa7c26: am
49983b99: Show correct text for app link domains.
* commit '
5cf37f71eba23cd596c989ab06e32c4c33bc3a40':
Show correct text for app link domains.
Sasha Levitskiy [Thu, 9 Jul 2015 00:28:42 +0000 (00:28 +0000)]
am
2e97520e: am
49abf5f4: am
93b1a5a9: Merge "Fingerprint: Add post enroll call" into mnc-dev
* commit '
2e97520ec03542071827eaea084055e9e16442fc':
Fingerprint: Add post enroll call
Tim Kilbourn [Thu, 9 Jul 2015 00:28:40 +0000 (00:28 +0000)]
am
8170e7a4: am
5ffa7c26: am
49983b99: Show correct text for app link domains.
* commit '
8170e7a49bea3a1d9e92caefcd28ba4e32d8c072':
Show correct text for app link domains.
Selim Cinek [Wed, 8 Jul 2015 23:53:05 +0000 (23:53 +0000)]
am
31e554ac: am
babeeacb: am
aab3a4c8: Merge "Fixed the layout for the fingerprint renaming" into mnc-dr-dev
* commit '
31e554acff0106cade16516a056bdc1b0087ee6c':
Fixed the layout for the fingerprint renaming
Sasha Levitskiy [Wed, 8 Jul 2015 23:46:02 +0000 (23:46 +0000)]
am
49abf5f4: am
93b1a5a9: Merge "Fingerprint: Add post enroll call" into mnc-dev
* commit '
49abf5f4cb9d363246659f9320a3bfb99288adfa':
Fingerprint: Add post enroll call
Tim Kilbourn [Wed, 8 Jul 2015 23:46:00 +0000 (23:46 +0000)]
am
5ffa7c26: am
49983b99: Show correct text for app link domains.
* commit '
5ffa7c260f34ead64572b05b501bde0d194fef81':
Show correct text for app link domains.
Selim Cinek [Wed, 8 Jul 2015 23:37:50 +0000 (23:37 +0000)]
am
babeeacb: am
aab3a4c8: Merge "Fixed the layout for the fingerprint renaming" into mnc-dr-dev
* commit '
babeeacb58d0e24b752598de0383e082e6c76784':
Fixed the layout for the fingerprint renaming
Sasha Levitskiy [Wed, 8 Jul 2015 23:37:33 +0000 (23:37 +0000)]
am
93b1a5a9: Merge "Fingerprint: Add post enroll call" into mnc-dev
* commit '
93b1a5a974f723f5aa463162b1f5aa43338f8c2e':
Fingerprint: Add post enroll call
Tim Kilbourn [Wed, 8 Jul 2015 23:37:32 +0000 (23:37 +0000)]
am
49983b99: Show correct text for app link domains.
* commit '
49983b991c01af0bc958eee1ddad144b7bde44ec':
Show correct text for app link domains.
Sasha Levitskiy [Wed, 8 Jul 2015 23:34:26 +0000 (23:34 +0000)]
Merge "Fingerprint: Add post enroll call" into mnc-dev
Selim Cinek [Wed, 8 Jul 2015 23:22:58 +0000 (23:22 +0000)]
am
aab3a4c8: Merge "Fixed the layout for the fingerprint renaming" into mnc-dr-dev
* commit '
aab3a4c84715ecb4c95b60081badd225202723df':
Fixed the layout for the fingerprint renaming
Selim Cinek [Wed, 8 Jul 2015 23:09:51 +0000 (23:09 +0000)]
Merge "Fixed the layout for the fingerprint renaming" into mnc-dr-dev
Sasha Levitskiy [Wed, 8 Jul 2015 22:36:44 +0000 (15:36 -0700)]
Fingerprint: Add post enroll call
Bug
22007124
Change-Id: I670e101a1b7dfa77a4e45022840dfc916fe5ee0d
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Jorim Jaggi [Wed, 8 Jul 2015 22:52:08 +0000 (22:52 +0000)]
am
2986b0dc: am
221f3771: am
3b517b68: am
b493b291: Merge "Hide screenshot preference when assist is disabled" into mnc-dev
* commit '
2986b0dc977131e80798b3701ba2c832537522d6':
Hide screenshot preference when assist is disabled
Jeff Sharkey [Wed, 8 Jul 2015 22:52:06 +0000 (22:52 +0000)]
am
05d51e24: am
22f66408: am
68fdb73d: am
80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev
* commit '
05d51e24744cb99edf00ea52b840be4d9662b8c2':
Move storage when formatting primary disk.
Selim Cinek [Wed, 8 Jul 2015 21:09:10 +0000 (14:09 -0700)]
Fixed the layout for the fingerprint renaming
Bug:
21957061
Change-Id: I3bf0ecb1f513b51e2632cb9ddbb29e51a39a915c
Tim Kilbourn [Thu, 11 Jun 2015 23:43:59 +0000 (16:43 -0700)]
Show correct text for app link domains.
The user's preferences were not queried on the app listing, making it
look like an app would open links even after the user disabled app
links for the app.
Bug:
21093152
Change-Id: I133ff229bb5e289ebec8df06924936fb3177f095
Jorim Jaggi [Wed, 8 Jul 2015 22:37:47 +0000 (22:37 +0000)]
am
221f3771: am
3b517b68: am
b493b291: Merge "Hide screenshot preference when assist is disabled" into mnc-dev
* commit '
221f3771aa3830ca8b8b662994759431dae2ee5b':
Hide screenshot preference when assist is disabled
Jeff Sharkey [Wed, 8 Jul 2015 22:37:44 +0000 (22:37 +0000)]
am
22f66408: am
68fdb73d: am
80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev
* commit '
22f664084dc0885a495194a907ce4c2af36c9c54':
Move storage when formatting primary disk.
Jorim Jaggi [Wed, 8 Jul 2015 22:22:13 +0000 (22:22 +0000)]
am
3b517b68: am
b493b291: Merge "Hide screenshot preference when assist is disabled" into mnc-dev
* commit '
3b517b68057857a2b2552dd09e520907c809f15a':
Hide screenshot preference when assist is disabled
Jeff Sharkey [Wed, 8 Jul 2015 22:22:11 +0000 (22:22 +0000)]
am
68fdb73d: am
80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev
* commit '
68fdb73d0cb2e354063ff5e37349d942923e379e':
Move storage when formatting primary disk.
Jorim Jaggi [Wed, 8 Jul 2015 22:08:34 +0000 (22:08 +0000)]
am
b493b291: Merge "Hide screenshot preference when assist is disabled" into mnc-dev
* commit '
b493b2910190b95bba6cad0f328a0339acebef9b':
Hide screenshot preference when assist is disabled
Jeff Sharkey [Wed, 8 Jul 2015 22:08:32 +0000 (22:08 +0000)]
am
80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev
* commit '
80eba76b109efa7e48eaf7aac145e05938d4405e':
Move storage when formatting primary disk.
Jorim Jaggi [Wed, 8 Jul 2015 21:59:00 +0000 (21:59 +0000)]
Merge "Hide screenshot preference when assist is disabled" into mnc-dev
Jeff Sharkey [Wed, 8 Jul 2015 21:55:17 +0000 (21:55 +0000)]
Merge "Move storage when formatting primary disk." into mnc-dev
Amit Mahajan [Wed, 8 Jul 2015 21:21:57 +0000 (21:21 +0000)]
am
e08a3512: am
07578125: am
2856c4fc: am
01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev
* commit '
e08a3512bbfb9c3ab73790cf382b514ec4924397':
Remove 'do not translate' comment for string 'None'.
Sanket Padawe [Wed, 8 Jul 2015 21:21:56 +0000 (21:21 +0000)]
am
012876e4: am
beb277de: am
a63ee14f: am
c7777b94: Merge "Locale based string changes in BT." into mnc-dev
* commit '
012876e400d573c9f2deb3c076c611f651e6e2ec':
Locale based string changes in BT.
Sanket Padawe [Wed, 8 Jul 2015 21:21:55 +0000 (21:21 +0000)]
am
bd19918f: am
3dfe8963: am
f7a64d20: am
c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev
* commit '
bd19918f87903031b6c32057a347d3759d9f1aca':
Disable CA certificate for EAP-SIM, AKA & AKA'
Amit Mahajan [Wed, 8 Jul 2015 21:08:11 +0000 (21:08 +0000)]
am
07578125: am
2856c4fc: am
01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev
* commit '
0757812525349f31d921bc877886ece7d3a44c4d':
Remove 'do not translate' comment for string 'None'.
Sanket Padawe [Wed, 8 Jul 2015 21:08:09 +0000 (21:08 +0000)]
am
beb277de: am
a63ee14f: am
c7777b94: Merge "Locale based string changes in BT." into mnc-dev
* commit '
beb277de3c01ca1bfed1e22be682a3f79325a6bf':
Locale based string changes in BT.
Sanket Padawe [Wed, 8 Jul 2015 21:08:08 +0000 (21:08 +0000)]
am
3dfe8963: am
f7a64d20: am
c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev
* commit '
3dfe8963e6d2a02818a22f6a063fb671e7560d10':
Disable CA certificate for EAP-SIM, AKA & AKA'
Amit Mahajan [Wed, 8 Jul 2015 20:53:35 +0000 (20:53 +0000)]
am
2856c4fc: am
01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev
* commit '
2856c4fcbd4d4453245f4ed0aa7bb1bc02b2bd14':
Remove 'do not translate' comment for string 'None'.
Sanket Padawe [Wed, 8 Jul 2015 20:53:32 +0000 (20:53 +0000)]
am
a63ee14f: am
c7777b94: Merge "Locale based string changes in BT." into mnc-dev
* commit '
a63ee14f45f22f87d2d112ee9e5686e91e9fedc7':
Locale based string changes in BT.
Sanket Padawe [Wed, 8 Jul 2015 20:53:31 +0000 (20:53 +0000)]
am
f7a64d20: am
c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev
* commit '
f7a64d206869ef783820f08966ad3bbf8ebe4559':
Disable CA certificate for EAP-SIM, AKA & AKA'
Amit Mahajan [Wed, 8 Jul 2015 20:37:19 +0000 (20:37 +0000)]
am
01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev
* commit '
01ce80b574e2404d911750c16a1ddd89c787f3ff':
Remove 'do not translate' comment for string 'None'.
Sanket Padawe [Wed, 8 Jul 2015 20:37:18 +0000 (20:37 +0000)]
am
c7777b94: Merge "Locale based string changes in BT." into mnc-dev
* commit '
c7777b947097160cd89252f1f1e27704d82c25f6':
Locale based string changes in BT.
Sanket Padawe [Wed, 8 Jul 2015 20:37:16 +0000 (20:37 +0000)]
am
c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev
* commit '
c9cdf9c814020c777ffec7cfceb5b38c74e091f5':
Disable CA certificate for EAP-SIM, AKA & AKA'
Jorim Jaggi [Wed, 8 Jul 2015 20:32:12 +0000 (13:32 -0700)]
Hide screenshot preference when assist is disabled
Bug:
22343636
Change-Id: Ic455232dda209f7fadec41aee85903623a4e6bda
Amit Mahajan [Wed, 8 Jul 2015 20:23:45 +0000 (20:23 +0000)]
Merge "Remove 'do not translate' comment for string 'None'." into mnc-dev
Amit Mahajan [Wed, 8 Jul 2015 18:07:34 +0000 (11:07 -0700)]
Remove 'do not translate' comment for string 'None'.
Bug:
22278463
Change-Id: I29c288cd36cd7b65132b42a4b78749afa81064d6
Sanket Padawe [Wed, 8 Jul 2015 17:15:56 +0000 (17:15 +0000)]
Merge "Locale based string changes in BT." into mnc-dev
Sanket Padawe [Wed, 8 Jul 2015 17:14:54 +0000 (17:14 +0000)]
Merge "Disable CA certificate for EAP-SIM, AKA & AKA'" into mnc-dev
Robin Lee [Wed, 8 Jul 2015 17:07:36 +0000 (17:07 +0000)]
am
a0c850f2: am
d81d249a: am
e46e4827: am
64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
* commit '
a0c850f24930ce6ad240e2a12aaf8ad020a7c561':
Restore Vpn advanced options on re-init or rotate
Robin Lee [Wed, 8 Jul 2015 16:54:55 +0000 (16:54 +0000)]
am
d81d249a: am
e46e4827: am
64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
* commit '
d81d249af4b5384c8caf8a2c3b3923684714193d':
Restore Vpn advanced options on re-init or rotate
Robin Lee [Wed, 8 Jul 2015 16:40:44 +0000 (16:40 +0000)]
am
e46e4827: am
64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
* commit '
e46e48271aacbe3278acb0dc52b439da1c3ec8e9':
Restore Vpn advanced options on re-init or rotate
Geoff Mendal [Wed, 8 Jul 2015 16:33:55 +0000 (16:33 +0000)]
am
d1a87a4a: (-s ours) am
d0249808: (-s ours) am
661dbf01: (-s ours) am
4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
d1a87a4a39d588ed320df69dde741968cb41da20':
Import translations. DO NOT MERGE
Robin Lee [Wed, 8 Jul 2015 16:27:42 +0000 (16:27 +0000)]
am
64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev
* commit '
64e1e15d10b41f6993abf4cb77d220a05f79191a':
Restore Vpn advanced options on re-init or rotate
Geoff Mendal [Wed, 8 Jul 2015 16:19:49 +0000 (16:19 +0000)]
am
d0249808: (-s ours) am
661dbf01: (-s ours) am
4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
d0249808fd8c1dd98b2cbe028a0448fda2e129ec':
Import translations. DO NOT MERGE
OSDN Git Service
