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

211780 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
981d81180e am 756bd429: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '756bd429bd6cf2d23e7132de09e61953cb7abc47':
  Import translations. DO NOT MERGE
 2015-09-29 14:57:42 +00:00
Baligh Uddin
9dd38f3f12 am 6f2bb3a3: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '6f2bb3a3c0697cbff6cf3b3ffde0c06cd911b9a9':
  Import translations. DO NOT MERGE
 2015-09-29 14:50:06 +00:00
Baligh Uddin
40359e0322 am ae442baf: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit 'ae442bafad49c8fa889b41771b0a8a505a427988':
  Import translations. DO NOT MERGE
 2015-09-29 14:49:59 +00:00
Baligh Uddin
e3e11d6dac am e2c9b91f: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit 'e2c9b91f53dc17ea62f5fa5ac9be1f4fff91203b':
  Import translations. DO NOT MERGE
 2015-09-29 14:49:53 +00:00
Baligh Uddin
756bd429bd Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-09-29 14:47:22 +00:00
Baligh Uddin
5ca3191a30 am 755e95a4: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '755e95a463559475a60c6360768175ec844104ec':
  Import translations. DO NOT MERGE
 2015-09-29 14:43:06 +00:00
Baligh Uddin
22a0c0e3dc am 0fb5f9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '0fb5f9f337292bd7ac4e380be72ffbaf9dccf51b':
  Import translations. DO NOT MERGE
 2015-09-29 14:42:58 +00:00
Baligh Uddin
9b552e3400 am 0d8e091e: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '0d8e091ee615fd8580d52e238070e26c3b41c594':
  Import translations. DO NOT MERGE
 2015-09-29 14:42:52 +00:00
Baligh Uddin
dbb9f370b2 am 0010f09a: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '0010f09a52532244939221392e8bf649cf0794ed':
  Import translations. DO NOT MERGE
 2015-09-29 14:42:45 +00:00
Baligh Uddin
514650d8a6 am 67162a22: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '67162a220cd4b7272b8b65f42f633b8a8065d185':
  Import translations. DO NOT MERGE
 2015-09-29 14:42:40 +00:00
Baligh Uddin
89176d5d00 am 19efc9e5: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '19efc9e50fd398a06493f841cdae469c0a93bc6d':
  Import translations. DO NOT MERGE
 2015-09-29 14:42:33 +00:00
Baligh Uddin
ab38b8e5ea am 42e73a82: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '42e73a82361e8161660e2af9e683edd496c18eeb':
  Import translations. DO NOT MERGE
 2015-09-29 14:42:26 +00:00
Baligh Uddin
6f2bb3a3c0 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-09-29 14:40:57 +00:00
Baligh Uddin
ae442bafad Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-09-29 14:40:41 +00:00
Baligh Uddin
e2c9b91f53 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-09-29 14:40:29 +00:00
Baligh Uddin
755e95a463 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-09-29 14:39:29 +00:00
Baligh Uddin
0fb5f9f337 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-09-29 14:39:25 +00:00
Baligh Uddin
0d8e091ee6 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-09-29 14:39:23 +00:00
Baligh Uddin
0010f09a52 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-09-29 14:39:20 +00:00
Baligh Uddin
67162a220c Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-09-29 14:39:16 +00:00
Baligh Uddin
19efc9e50f Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-09-29 14:38:48 +00:00
Baligh Uddin
42e73a8236 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-09-29 14:38:16 +00:00
Baligh Uddin
23de74aed5 am b52e5e38: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit 'b52e5e38981639e5d0f84e6fda2c6cb602b0eeac':
  Import translations. DO NOT MERGE
 2015-09-29 14:27:45 +00:00
Baligh Uddin
b52e5e3898 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-09-29 14:16:23 +00:00
Baligh Uddin
fcbe223d03 Import translations. DO NOT MERGE 
Change-Id: I183c668c3c25901599a969206c5b8e0026ae3d4c
Auto-generated-cl: translation import
 2015-09-29 03:13:09 -07:00
Baligh Uddin
3241a48ee5 Import translations. DO NOT MERGE 
Change-Id: I26c007f30d5540638e8519f09051088d55b7dcd7
Auto-generated-cl: translation import
 2015-09-29 01:57:43 -07:00
Baligh Uddin
3f9f60270f Import translations. DO NOT MERGE 
Change-Id: I7b78a94809c16f73faaf44c1998e08165ff2014e
Auto-generated-cl: translation import
 2015-09-29 01:55:45 -07:00
Baligh Uddin
05bae6ab02 Import translations. DO NOT MERGE 
Change-Id: Ibc1f9d45ae3e029f0a2e7801f1c754c0d81a911b
Auto-generated-cl: translation import
 2015-09-29 01:46:59 -07:00
Baligh Uddin
ca441fee3e Import translations. DO NOT MERGE 
Change-Id: I99d39e62622079d2e0dcfd2b739aded1ef286352
Auto-generated-cl: translation import
 2015-09-29 01:45:05 -07:00
Baligh Uddin
64788fa4ca Import translations. DO NOT MERGE 
Change-Id: I3486557152d39d80058d08ce50ae4eb09764a009
Auto-generated-cl: translation import
 2015-09-29 01:42:59 -07:00
Baligh Uddin
637eb2d9ed Import translations. DO NOT MERGE 
Change-Id: I2cdd44b0019090f2f4dbe355901e8ad8ffef626e
Auto-generated-cl: translation import
 2015-09-29 01:37:52 -07:00
Baligh Uddin
e25af1d23e Import translations. DO NOT MERGE 
Change-Id: Ia575dec5643f0e64e9c95ac8a9e9d0ef717b6c46
Auto-generated-cl: translation import
 2015-09-29 01:35:38 -07:00
Baligh Uddin
b0dac458ec Import translations. DO NOT MERGE 
Change-Id: I55491102910a9032fe4bfaec05916a2e627c7b86
Auto-generated-cl: translation import
 2015-09-29 01:33:36 -07:00
Baligh Uddin
b73d641fe7 Import translations. DO NOT MERGE 
Change-Id: I4792c6e15e22c63197f7c73ea05db41ce896f561
Auto-generated-cl: translation import
 2015-09-29 01:31:39 -07:00
Baligh Uddin
47dede9814 Import translations. DO NOT MERGE 
Change-Id: I72e15159d79d575b98af928b6d79b5ecd2cf03d1
Auto-generated-cl: translation import
 2015-09-29 01:29:36 -07:00
Baligh Uddin
268c1d9058 Import translations. DO NOT MERGE 
Change-Id: I7de2baf9bc397126186b682cd5893629d4a8a33b
Auto-generated-cl: translation import
 2015-09-29 01:27:34 -07:00
Bill Rassieur
6e78bb42fc am 2711eb4c: am 3de2d53a: am c25d5460: Merge "Fix jank: Don\'t write lockout deadline if not needed" into mnc-dr-dev 
* commit '2711eb4c3950ee0b5776c07957f0af3c31aa1c67':
  Fix jank: Don't write lockout deadline if not needed
 2015-09-28 23:19:32 +00:00
Bill Rassieur
2711eb4c39 am 3de2d53a: am c25d5460: Merge "Fix jank: Don\'t write lockout deadline if not needed" into mnc-dr-dev 
* commit '3de2d53a75ed66ee3e64412adfb77ff5a729b43a':
  Fix jank: Don't write lockout deadline if not needed
 2015-09-28 23:15:24 +00:00
Bill Rassieur
3de2d53a75 am c25d5460: Merge "Fix jank: Don\'t write lockout deadline if not needed" into mnc-dr-dev 
* commit 'c25d546050423845c42a5e8cc8e356caa1f4f71a':
  Fix jank: Don't write lockout deadline if not needed
 2015-09-28 23:09:10 +00:00
Bill Rassieur
c25d546050 Merge "Fix jank: Don't write lockout deadline if not needed" into mnc-dr-dev 2015-09-28 23:02:46 +00:00
Dan Willemsen
cd72b8be46 am f21beb12: am 899110f3: Merge "Add exported include dir for libandroid_runtime" 
* commit 'f21beb12f95b311ae20f2b5058252eb386a8b7b8':
  Add exported include dir for libandroid_runtime
 2015-09-28 21:30:46 +00:00
Dan Willemsen
f21beb12f9 am 899110f3: Merge "Add exported include dir for libandroid_runtime" 
* commit '899110f3012eb9ab2056d8ee182d5bdab0ecae19':
  Add exported include dir for libandroid_runtime
 2015-09-28 21:23:57 +00:00
Dan Willemsen
899110f301 Merge "Add exported include dir for libandroid_runtime" 2015-09-28 21:14:42 +00:00
Jorim Jaggi
e3e6d56b94 Fix jank: Don't write lockout deadline if not needed 
In the longterm, we should move these synchronous writes
off the main thread, but in the short term, avoiding an unnecessary
write is good enough for the main case.

Bug: 24471234
Change-Id: Id996ff29e61410cd077760a06d7868a413ae88da
 2015-09-28 13:57:37 -07:00
Dimitry Ivanov
8571397a0f am ef9e04b2: am 66f5affb: Merge "Fix bug number for linker related workarounds" 
* commit 'ef9e04b21020fd9e0e4be804627dc96e44e3581c':
  Fix bug number for linker related workarounds
 2015-09-28 18:28:22 +00:00
Todd Kennedy
b4d41021b4 am 92b28f37: resolved conflicts for 4ed21bf0 to stage-aosp-master 
* commit '92b28f37de9956c172f779df4cf540abc5b94deb':
  Allow using the JIT
 2015-09-28 18:28:14 +00:00
Dimitry Ivanov
ef9e04b210 am 66f5affb: Merge "Fix bug number for linker related workarounds" 
* commit '66f5affbe41a49bedf35e73b7c7f482db6e2fa7b':
  Fix bug number for linker related workarounds
 2015-09-28 18:23:56 +00:00
Todd Kennedy
92b28f37de resolved conflicts for 4ed21bf0 to stage-aosp-master 
Change-Id: I9c8ab83589ee3786c884f34066c1f3d709dc5136
 2015-09-28 11:20:38 -07:00
Dimitry Ivanov
66f5affbe4 Merge "Fix bug number for linker related workarounds" 2015-09-28 18:07:40 +00:00
Todd Kennedy
4ed21bf038 Merge "Allow using the JIT" 2015-09-28 17:47:01 +00:00