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

163306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
0e14576e9a am 62993e28: (-s ours) am 7c1157fd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '62993e2834a9fd7a9be1eb915b8e686b8ff3e518':
  Import translations. DO NOT MERGE
 2014-09-21 18:15:50 +00:00
Baligh Uddin
42ac06cc31 am 7b9463ef: (-s ours) am e3fc4b59: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '7b9463ef4c83307ee08027b3238ca0c387a3265e':
  Import translations. DO NOT MERGE
 2014-09-21 18:15:46 +00:00
Baligh Uddin
6ad5a222fa am 568ea108: (-s ours) am c666d11e: (-s ours) Import translations. DO NOT MERGE 
* commit '568ea10834ab38918988def14014e32808d06752':
  Import translations. DO NOT MERGE
 2014-09-21 18:15:43 +00:00
Baligh Uddin
4dc104c362 Merge "Import translations. DO NOT MERGE" 2014-09-21 18:07:40 +00:00
Baligh Uddin
d0b1df7b1b am 7c1157fd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '7c1157fd6ed94c07ebb5fbc11696b334201d516a':
  Import translations. DO NOT MERGE
 2014-09-21 18:05:00 +00:00
Baligh Uddin
a02cb983f8 am e3fc4b59: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'e3fc4b598de2cd0b8eb011b0c36bd84adc750471':
  Import translations. DO NOT MERGE
 2014-09-21 18:04:56 +00:00
Baligh Uddin
1c879a0ab9 am c666d11e: (-s ours) Import translations. DO NOT MERGE 
* commit 'c666d11e28cf98e917ba94c9be7ce4d218dcf204':
  Import translations. DO NOT MERGE
 2014-09-21 18:04:37 +00:00
Baligh Uddin
2947d6283a Merge "Import translations. DO NOT MERGE" 2014-09-21 17:52:17 +00:00
Baligh Uddin
c416d6a1f9 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-09-21 17:52:14 +00:00
Baligh Uddin
26ce6b7db8 Merge "Import translations. DO NOT MERGE" 2014-09-21 17:52:06 +00:00
Baligh Uddin
3fc90ddf2a Merge "Import translations. DO NOT MERGE" 2014-09-21 17:52:00 +00:00
Baligh Uddin
d411d5a87b Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-09-21 17:51:53 +00:00
Baligh Uddin
769e5e56b8 Merge "Import translations. DO NOT MERGE" 2014-09-21 17:51:48 +00:00
Baligh Uddin
cc81d5ce7d Merge "Import translations. DO NOT MERGE" 2014-09-21 17:51:44 +00:00
Baligh Uddin
0fceb1503a Merge "Import translations. DO NOT MERGE" 2014-09-21 17:51:02 +00:00
Baligh Uddin
63649e4666 Import translations. DO NOT MERGE 
Change-Id: I3747af453da6584d90fd2f91ace4ea7d9cff1e60
Auto-generated-cl: translation import
 2014-09-20 23:16:23 -07:00
Baligh Uddin
bf43691cc9 Import translations. DO NOT MERGE 
Change-Id: Icd10ba35892ef4cfcd116ca9f86ba8fe88a8c62c
Auto-generated-cl: translation import
 2014-09-20 16:23:44 -07:00
Baligh Uddin
ba79ed185a Import translations. DO NOT MERGE 
Change-Id: I86574134832a7ecc70bae35901997448bf241460
Auto-generated-cl: translation import
 2014-09-20 16:13:58 -07:00
Baligh Uddin
da947510ca Import translations. DO NOT MERGE 
Change-Id: I21d151241e5e6a60e913a3e42eaa5ed5bc12b098
Auto-generated-cl: translation import
 2014-09-20 15:49:22 -07:00
Baligh Uddin
19709e0315 Import translations. DO NOT MERGE 
Change-Id: I86348fe965b0499e03f639e80546fac588d50e78
Auto-generated-cl: translation import
 2014-09-20 15:47:29 -07:00
Baligh Uddin
4934025666 Import translations. DO NOT MERGE 
Change-Id: I799522b70883c48556b4563cb1b28e68c8578aa7
Auto-generated-cl: translation import
 2014-09-20 13:44:36 -07:00
Baligh Uddin
810b0d046b Import translations. DO NOT MERGE 
Change-Id: Ib7023f1579781f155196f993f408fd5bfd5a7993
Auto-generated-cl: translation import
 2014-09-20 13:07:20 -07:00
Nick Kralevich
061155eb6e am 8f067ca1: resolved conflicts for merge of 4cbee7d2 to lmp-mr1-dev-plus-aosp 
* commit '8f067ca18d333bf03b7dc8a60c2b66b1faf0e5ac':
  Remove MALLOC_LEAK_CHECK references.
 2014-09-20 20:04:44 +00:00
Baligh Uddin
6fec1df8cb Import translations. DO NOT MERGE 
Change-Id: I494beec337bdfcce1577980b5fa5467e318bb2e6
Auto-generated-cl: translation import
 2014-09-20 13:02:33 -07:00
Baligh Uddin
ed9b1a848d Import translations. DO NOT MERGE 
Change-Id: Ieb412ac9804570a48077a9cf8f425d7fe306016e
Auto-generated-cl: translation import
 2014-09-20 13:00:56 -07:00
Baligh Uddin
0e474c898c Import translations. DO NOT MERGE 
Change-Id: I73abf0516cb01fe6c6ae9a0b01fa805b26818c76
Auto-generated-cl: translation import
 2014-09-20 12:58:39 -07:00
Nick Kralevich
4986a3875f resolved conflicts for merge of 4cbee7d2 to lmp-mr1-dev-plus-aosp 
Change-Id: Ibed2d1ef98e13b7d50781020502665620ab15659
 2014-09-20 11:15:50 -07:00
Christopher Ferris
27c5da9594 am 9dce5bd2: am 7d113829: am b6f891c4: Merge "Remove MALLOC_LEAK_CHECK references." 
* commit '9dce5bd2c6e738d183fd514914684098d4ac2093':
  Remove MALLOC_LEAK_CHECK references.
 2014-09-20 03:20:08 +00:00
Yigit Boyar
1d8a32da72 am 4a1d6875: am 1ea86977: am 6477ca14: am 397c6004: am 646e0428: Merge "Find activity from context in menu inflator for click events" into lmp-dev 
* commit '4a1d68759a4a4ec1df3f77d0f83663d8372ce89f':
  Find activity from context in menu inflator for click events
 2014-09-20 02:59:39 +00:00
Jeff Brown
37b95162f3 am 86fdd3cf: am 77e786ab: am 978272f4: am a94c9ccb: am 09395677: Merge "Decouple turning screen on from waking up in policy." into lmp-dev 
* commit '86fdd3cfebf2e4dee1b5244246604f1eb3eb6c03':
  Decouple turning screen on from waking up in policy.
 2014-09-20 02:59:33 +00:00
Jeff Brown
303aa16876 am 64df7966: am 39a150b7: am 6adfcedc: am f138c63e: am 6d098d40: Merge "Fix order of operations while pulsing the ambient display." into lmp-dev 
* commit '64df79668385e2107178f4740346ab50d72f0c11':
  Fix order of operations while pulsing the ambient display.
 2014-09-20 02:59:29 +00:00
Jeff Brown
9654aef21a am 3431af0d: am f11b919a: am 2da2e364: am 5737f7d7: am f10fc92c: Merge "Ensure that the screen on blocker is applied while dozing." into lmp-dev 
* commit '3431af0db909b0211793bb3a626abab4704d015b':
  Ensure that the screen on blocker is applied while dozing.
 2014-09-20 02:59:24 +00:00
Christopher Ferris
172fa08e95 am 7d113829: am b6f891c4: Merge "Remove MALLOC_LEAK_CHECK references." 
* commit '7d1138298b37bca2340fc4610090b53f5b838f7a':
  Remove MALLOC_LEAK_CHECK references.
 2014-09-20 02:56:48 +00:00
Yigit Boyar
cb0721ff8f am 1ea86977: am 6477ca14: am 397c6004: am 646e0428: Merge "Find activity from context in menu inflator for click events" into lmp-dev 
* commit '1ea86977bf9d9106728c5344ee1e5f054b8973e5':
  Find activity from context in menu inflator for click events
 2014-09-20 02:44:20 +00:00
Jeff Brown
4df057c98b am 77e786ab: am 978272f4: am a94c9ccb: am 09395677: Merge "Decouple turning screen on from waking up in policy." into lmp-dev 
* commit '77e786abd5f2dcb74de3cc083c1cc64c884fac9d':
  Decouple turning screen on from waking up in policy.
 2014-09-20 02:44:14 +00:00
Jeff Brown
a9c0b9ba3f am 39a150b7: am 6adfcedc: am f138c63e: am 6d098d40: Merge "Fix order of operations while pulsing the ambient display." into lmp-dev 
* commit '39a150b73b61fbc30bfcce854539cc3670809457':
  Fix order of operations while pulsing the ambient display.
 2014-09-20 02:44:08 +00:00
Jeff Brown
6e58cb47fe am f11b919a: am 2da2e364: am 5737f7d7: am f10fc92c: Merge "Ensure that the screen on blocker is applied while dozing." into lmp-dev 
* commit 'f11b919a8e9ced3bd8eca4743a14e4bf18c451f3':
  Ensure that the screen on blocker is applied while dozing.
 2014-09-20 02:44:00 +00:00
Yigit Boyar
27b767134b am 6477ca14: am 397c6004: am 646e0428: Merge "Find activity from context in menu inflator for click events" into lmp-dev 
* commit '6477ca149262e630ac1f2426dc6d9dca2ab279db':
  Find activity from context in menu inflator for click events
 2014-09-20 02:24:22 +00:00
Jeff Brown
bdd4e4af79 am 978272f4: am a94c9ccb: am 09395677: Merge "Decouple turning screen on from waking up in policy." into lmp-dev 
* commit '978272f46f6bce0ef6557dffe770825122a70d86':
  Decouple turning screen on from waking up in policy.
 2014-09-20 02:24:18 +00:00
Jeff Brown
4c575967f2 am 6adfcedc: am f138c63e: am 6d098d40: Merge "Fix order of operations while pulsing the ambient display." into lmp-dev 
* commit '6adfcedc5483bfb2fcaec29d6cc9694bc723bd32':
  Fix order of operations while pulsing the ambient display.
 2014-09-20 02:24:13 +00:00
Jeff Brown
fb92f2cb16 am 2da2e364: am 5737f7d7: am f10fc92c: Merge "Ensure that the screen on blocker is applied while dozing." into lmp-dev 
* commit '2da2e364efbefaccf33639e6be06194eb9be5fd3':
  Ensure that the screen on blocker is applied while dozing.
 2014-09-20 02:24:09 +00:00
Christopher Tate
46380962f3 am 1f2e31ef: am 1c1ffb64: am 4cd2c811: am ebff637b: am c9a016dd: Merge "Always give wifi a chance to quiet down during restore" into lmp-dev 
* commit '1f2e31efb8ce78f99c86f7847b7498e23937d2ff':
  Always give wifi a chance to quiet down during restore
 2014-09-20 02:17:32 +00:00
Dianne Hackborn
09a5285130 am 2412cca0: am 0eec7efe: am 423a1069: am cec64f46: am da7e72b1: Merge "Fix issue #17492300: NavUtils.shouldUpRecreateTask returns different..." into lmp-dev 
* commit '2412cca04b4bb331aa0f95bd8e1454203befe8c2':
  Fix issue #17492300: NavUtils.shouldUpRecreateTask returns different...
 2014-09-20 02:17:28 +00:00
Yigit Boyar
31ff5b9fd3 am 397c6004: am 646e0428: Merge "Find activity from context in menu inflator for click events" into lmp-dev 
* commit '397c6004706f93941514d31c2cafdbd6183634fd':
  Find activity from context in menu inflator for click events
 2014-09-20 02:05:07 +00:00
Jeff Brown
de7c9b964f am a94c9ccb: am 09395677: Merge "Decouple turning screen on from waking up in policy." into lmp-dev 
* commit 'a94c9ccb8a7f85ff2a3e1329e94367c863f39309':
  Decouple turning screen on from waking up in policy.
 2014-09-20 02:05:03 +00:00
Jeff Brown
4ed1dbcf0b am f138c63e: am 6d098d40: Merge "Fix order of operations while pulsing the ambient display." into lmp-dev 
* commit 'f138c63e799090b7e796b577ce9926753c7b77c8':
  Fix order of operations while pulsing the ambient display.
 2014-09-20 02:04:59 +00:00
Jeff Brown
00a3441b25 am 5737f7d7: am f10fc92c: Merge "Ensure that the screen on blocker is applied while dozing." into lmp-dev 
* commit '5737f7d75c34b2cb7c66771d3cda21a019acd2d2':
  Ensure that the screen on blocker is applied while dozing.
 2014-09-20 02:04:55 +00:00
Christopher Tate
a3d0f3f44a am 1c1ffb64: am 4cd2c811: am ebff637b: am c9a016dd: Merge "Always give wifi a chance to quiet down during restore" into lmp-dev 
* commit '1c1ffb64c1a9fa2a173cba112a27daf4262c63a2':
  Always give wifi a chance to quiet down during restore
 2014-09-20 01:54:05 +00:00
Dianne Hackborn
ae6865522e am 0eec7efe: am 423a1069: am cec64f46: am da7e72b1: Merge "Fix issue #17492300: NavUtils.shouldUpRecreateTask returns different..." into lmp-dev 
* commit '0eec7efe935d3eeb9d5fe52eb5c7cf0ca2463b49':
  Fix issue #17492300: NavUtils.shouldUpRecreateTask returns different...
 2014-09-20 01:53:58 +00:00
Yigit Boyar
0f46dd0de9 am 646e0428: Merge "Find activity from context in menu inflator for click events" into lmp-dev 
* commit '646e0428a489d786c29a9ad48c1f21f3d644af42':
  Find activity from context in menu inflator for click events
 2014-09-20 01:36:12 +00:00