drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
141,744 Commits 1 Branch 0 Tags
Commit Graph

141744 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
e532e686cb am 03c248aa: (-s ours) am 51ad6520: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '03c248aadece8459d2568dd8721d46cf748c7a56':
  Import translations. DO NOT MERGE
 2014-07-06 18:33:33 +00:00
Baligh Uddin
52b7c688ff am b140440e: (-s ours) am 6b7d2cf7: (-s ours) am f67d4baf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'b140440ea33ce512ba372deb11171ac688b1200b':
  Import translations. DO NOT MERGE
 2014-07-06 18:33:29 +00:00
Baligh Uddin
301c1f5d18 am 75a54319: (-s ours) am 6df13287: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '75a543193546525908c94981721a5d19f31fe285':
  Import translations. DO NOT MERGE
 2014-07-06 18:33:26 +00:00
Baligh Uddin
4e899ae24b am 3b7b9f95: (-s ours) am 334c84cf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '3b7b9f95a920e9b97067bc8004bd96156bcd8f7e':
  Import translations. DO NOT MERGE
 2014-07-06 18:33:22 +00:00
Baligh Uddin
494d4005d5 am ab157d74: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'ab157d740ed5c0bff544adc8992d9fce99462707':
  Import translations. DO NOT MERGE
 2014-07-06 18:33:21 +00:00
Baligh Uddin
861beac4f3 am 87bcd150: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '87bcd150a4122b78e98d3b859869b54e4546405d':
  Import translations. DO NOT MERGE
 2014-07-06 18:33:17 +00:00
Baligh Uddin
476a40e332 am f643d529: (-s ours) am b4600e79: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'f643d52941be004e14b7edfe3035996475f95028':
  Import translations. DO NOT MERGE
 2014-07-06 18:33:12 +00:00
Baligh Uddin
2353a8fc5d am 2f689434: (-s ours) am f599be53: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '2f6894345691af96d23952146bc3495758f84fbb':
  Import translations. DO NOT MERGE
 2014-07-06 18:33:08 +00:00
Baligh Uddin
8e1bf9f1a3 am 43ba3ba4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '43ba3ba479e3779db4f260eae55ddbfbf3dc30d8':
  Import translations. DO NOT MERGE
 2014-07-06 18:33:07 +00:00
Baligh Uddin
5195064e82 am 6e90b3c0: (-s ours) am f1c1e725: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '6e90b3c078baa2b6c6398376490b7c540309be70':
  Import translations. DO NOT MERGE
 2014-07-06 18:33:04 +00:00
Baligh Uddin
2ea222e661 am 93360f02: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '93360f022ec67bb994f04f9799bfac32997f0d00':
  Import translations. DO NOT MERGE
 2014-07-06 18:33:04 +00:00
Baligh Uddin
ee7333b2c1 am b14aee38: (-s ours) am add3fb66: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'b14aee38b65d1896f51a31c428c1eb387709597a':
  Import translations. DO NOT MERGE
 2014-07-06 18:29:18 +00:00
Baligh Uddin
ad74023c56 am bd9866d3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'bd9866d3e8ea9deb5b0bd5614a940cde841222ab':
  Import translations. DO NOT MERGE
 2014-07-06 18:29:13 +00:00
Baligh Uddin
03c248aade am 51ad6520: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '51ad6520b6d7870dc26d20139cc3a934dfb994f6':
  Import translations. DO NOT MERGE
 2014-07-06 18:29:03 +00:00
Baligh Uddin
b140440ea3 am 6b7d2cf7: (-s ours) am f67d4baf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '6b7d2cf77d28922a8e81730e2a462aab258dfe68':
  Import translations. DO NOT MERGE
 2014-07-06 18:28:54 +00:00
Baligh Uddin
75a5431935 am 6df13287: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '6df132872faa605304ab9dc488cc589580742a28':
  Import translations. DO NOT MERGE
 2014-07-06 18:28:50 +00:00
Baligh Uddin
3b7b9f95a9 am 334c84cf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '334c84cfe60cd938317d0a3ee1a47c5cc8331077':
  Import translations. DO NOT MERGE
 2014-07-06 18:28:47 +00:00
Baligh Uddin
f643d52941 am b4600e79: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'b4600e793b4b8a4332031d08c5ba5290abe0c71d':
  Import translations. DO NOT MERGE
 2014-07-06 18:26:05 +00:00
Baligh Uddin
2f68943456 am f599be53: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'f599be53727976c495575e864e1566cfdaf2eee5':
  Import translations. DO NOT MERGE
 2014-07-06 18:26:01 +00:00
Baligh Uddin
6e90b3c078 am f1c1e725: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'f1c1e725ec44aab7ebc5c4530133b169ddb6f73e':
  Import translations. DO NOT MERGE
 2014-07-06 18:25:58 +00:00
Baligh Uddin
6b7d2cf77d am f67d4baf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'f67d4bafee9ab60912add98ad4ec0697d3e231fc':
  Import translations. DO NOT MERGE
 2014-07-06 18:21:51 +00:00
Baligh Uddin
72c253eaf3 am c1f450dc: (-s ours) am fd5e4617: (-s ours) am f2e29071: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'c1f450dc64d43c0893858538c96fd0a1e7992565':
  Import translations. DO NOT MERGE
 2014-07-06 18:21:24 +00:00
Baligh Uddin
c354c0fb8d am 16b3c375: am 026d5d21: Merge branch \'klp-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-ub-dev 
* commit '16b3c3750f9a6ea13f313eb5e76ae3adbfb6fc83':
  Import translations. DO NOT MERGE
 2014-07-06 18:21:20 +00:00
Baligh Uddin
573ac636a9 am ac572525: (-s ours) am e885a9ca: (-s ours) am eb17f6ab: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'ac572525dfe2664bc2bd4fea510c3ca5e600648a':
  Import translations. DO NOT MERGE
 2014-07-06 18:21:16 +00:00
Baligh Uddin
b14aee38b6 am add3fb66: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'add3fb664a7e245caf86facc1855d8b9ce4281be':
  Import translations. DO NOT MERGE
 2014-07-06 18:21:15 +00:00
Baligh Uddin
9048d47655 am 200e21c5: (-s ours) am 57a85cee: (-s ours) am 77c61120: (-s ours) Import translations. DO NOT MERGE 
* commit '200e21c58996d76eb16e85963ca6c44770f9db05':
  Import translations. DO NOT MERGE
 2014-07-06 18:21:13 +00:00
Baligh Uddin
a6580ffd11 am ca78b88e: (-s ours) am b84a800c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'ca78b88eaa4d8b14d2dc1347f65715d2008e2974':
  Import translations. DO NOT MERGE
 2014-07-06 18:15:28 +00:00
Baligh Uddin
5c07864928 am f6020778: (-s ours) am 562d8cc7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'f6020778cd651dbec3ae907dde7880b4c0ef66c4':
  Import translations. DO NOT MERGE
 2014-07-06 18:15:24 +00:00
Baligh Uddin
5ec98181c1 am 037bcb40: (-s ours) am f617f4d0: (-s ours) Import translations. DO NOT MERGE 
* commit '037bcb4022432b6bee530964ae6b96c8e81c7768':
  Import translations. DO NOT MERGE
 2014-07-06 18:15:20 +00:00
Baligh Uddin
c1f450dc64 am fd5e4617: (-s ours) am f2e29071: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'fd5e46171db33fc2f5dcb6fbfbb6b19e36e9b485':
  Import translations. DO NOT MERGE
 2014-07-06 18:13:04 +00:00
Baligh Uddin
16b3c3750f am 026d5d21: Merge branch \'klp-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-ub-dev 
* commit '026d5d21e1de6ba1a085059bb9a6c959690dc994':
  Import translations. DO NOT MERGE
 2014-07-06 18:12:41 +00:00
Baligh Uddin
ac572525df am e885a9ca: (-s ours) am eb17f6ab: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'e885a9ca9b54aec74dc78de1fab0f2efeb910046':
  Import translations. DO NOT MERGE
 2014-07-06 18:12:38 +00:00
Baligh Uddin
200e21c589 am 57a85cee: (-s ours) am 77c61120: (-s ours) Import translations. DO NOT MERGE 
* commit '57a85ceed620a2c13dfddfbe702a1baee0076343':
  Import translations. DO NOT MERGE
 2014-07-06 18:12:35 +00:00
Baligh Uddin
fd5e46171d am f2e29071: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'f2e29071079ab67d6ed66852f6a6f5d4f1ee8753':
  Import translations. DO NOT MERGE
 2014-07-06 18:08:28 +00:00
Baligh Uddin
026d5d21e1 Merge branch 'klp-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-ub-dev 2014-07-06 18:08:27 +00:00
Baligh Uddin
ca78b88eaa am b84a800c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'b84a800c173d6f6690568b59be0708c8dcb9fb4d':
  Import translations. DO NOT MERGE
 2014-07-06 18:08:20 +00:00
Baligh Uddin
e885a9ca9b am eb17f6ab: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'eb17f6ab69ce9dda043c17827351522a8bcc2613':
  Import translations. DO NOT MERGE
 2014-07-06 18:08:20 +00:00
Baligh Uddin
57a85ceed6 am 77c61120: (-s ours) Import translations. DO NOT MERGE 
* commit '77c6112089e3fb58189b69f56f14b55a94c6b0da':
  Import translations. DO NOT MERGE
 2014-07-06 18:08:17 +00:00
Baligh Uddin
f6020778cd am 562d8cc7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '562d8cc7bc203a03ed20f1dbf25ef5f3f80c4705':
  Import translations. DO NOT MERGE
 2014-07-06 18:08:16 +00:00
Baligh Uddin
037bcb4022 am f617f4d0: (-s ours) Import translations. DO NOT MERGE 
* commit 'f617f4d074886949f48e0f1c507f76d917a7f2b2':
  Import translations. DO NOT MERGE
 2014-07-06 18:08:13 +00:00
Baligh Uddin
ec2bceaa74 am 30a777ef: (-s ours) Import translations. DO NOT MERGE 
* commit '30a777ef5bea16605aea06dd7b545938d019b28f':
  Import translations. DO NOT MERGE
 2014-07-06 18:07:09 +00:00
Craig Mautner
c66da9d606 Merge "[ActivityManager] Prevent kill a restarted process again." 2014-07-06 03:24:06 +00:00
dcashman
5984ac40e4 Merge "Record properSigningKeySet values to packages.xml" 2014-07-06 02:28:07 +00:00
dcashman
3a0dbfb206 Record properSigningKeySet values to packages.xml 
PackageKeySetData records all of the defined keysets which are a subset of an
apk's signing keyset.  It also records the original superset for all of these
in an easy-to-access 'proper' signing-keyset which is consulted as the official
source for a package.  This value was not being recorded, causing
PackageManager to re-gather the certificates for a package on each boot after
a fix for a different bug.  Record it.

Bug: 16076095
Change-Id: If5a7f6d70dd4784284d7bab466dab0311aa13c28
 2014-07-07 14:09:37 -07:00
Brian Carlstrom
9d5e7dbcf1 am 1f8eb4a6: (-s ours) am 044492e1: am 52a154fe: Merge "Remove" 
* commit '1f8eb4a6b0c9e8aa349212318b416e2d05b8c23c':
  Remove
 2014-07-07 21:08:48 +00:00
Julia Reynolds
5e458dd6b4 Apply user restrictions to SettingsProvider. 
Change-Id: If68c715bc688bf0df63591e0b8f8bf8a2b6dd118
 2014-07-07 20:09:23 +00:00
Fabrice Di Meglio
f9499b36e6 Add PreferenceFragment styling 
- add the capability to specify a specific layout for PreferenceFragment

Change-Id: I2fa36b8fa8110e6cbc8006e1d000dc90ae6a5f0b
 2014-07-07 20:08:27 +00:00
Robert Ly
8f0f930d3b Merge "Fix incorrect link in Android Wear documentation." into klp-modular-dev 2014-07-06 02:28:07 +00:00
Flavio Lerda
474cdf258f Fix incorrect link in Android Wear documentation. 
The link name was misspelled and pointed to the wrong directory.

Change-Id: I471892349dbe3ebbe9ec425a2a78b172d2ec6a0f
 2014-07-06 21:59:06 +00:00
Baligh Uddin
f617f4d074 Import translations. DO NOT MERGE 
Change-Id: Ia07b3b246f397eda9216449403dd283e02f69c42
Auto-generated-cl: translation import
 2014-07-05 15:42:53 -07:00