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

159273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
f24825e716 am e42d82b5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'e42d82b50ac40af89d304842232a9e154c776534':
  Import translations. DO NOT MERGE
 2014-09-21 18:16:45 +00:00
Baligh Uddin
b3a474f579 am 02ea5cce: (-s ours) am 71f9d6af: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '02ea5cce3489af4069d90d5f00063624e05e7a9c':
  Import translations. DO NOT MERGE
 2014-09-21 18:16:41 +00:00
Baligh Uddin
24bc661edc am 4719a55b: (-s ours) am 8b8757a2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '4719a55b018e5da1e767e40b61bfa08e71b75779':
  Import translations. DO NOT MERGE
 2014-09-21 18:16:37 +00:00
Baligh Uddin
ab936ad9d5 am 757218eb: (-s ours) am f4b32152: (-s ours) Import translations. DO NOT MERGE 
* commit '757218ebb013489bf8afc48a39395c0461b8dff1':
  Import translations. DO NOT MERGE
 2014-09-21 18:16:33 +00:00
Baligh Uddin
11f6e414d4 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-09-21 18:07:44 +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
c114196a30 am 71f9d6af: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '71f9d6afdc8e3ed2ad8b4a24800e66e3aab13252':
  Import translations. DO NOT MERGE
 2014-09-21 18:04:56 +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
b8be77af27 am 8b8757a2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '8b8757a2f32a1d1b6b123e6215deff48042a01ad':
  Import translations. DO NOT MERGE
 2014-09-21 18:04:41 +00:00
Baligh Uddin
830d0b3722 am f4b32152: (-s ours) Import translations. DO NOT MERGE 
* commit 'f4b321526d6ceea190a1d9284fd6a45895071c97':
  Import translations. DO NOT MERGE
 2014-09-21 18:04:37 +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
6a307e8ba1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-09-21 17:52:16 +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
e2334661d7 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-09-21 17:51:55 +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
5e4576ca87 Import translations. DO NOT MERGE 
Change-Id: Ib5b293b29ddcea39bcba9d707ef2b25bc2af5772
Auto-generated-cl: translation import
 2014-09-20 23:12:21 -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
63caa9d5c3 Import translations. DO NOT MERGE 
Change-Id: Ibe2f80b5805c0805c1eb708deadf81b57302e8c5
Auto-generated-cl: translation import
 2014-09-20 16:11:52 -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
5c87e54608 Import translations. DO NOT MERGE 
Change-Id: Ic10484794305306aef57f8e289c27a3aa438a26e
Auto-generated-cl: translation import
 2014-09-20 13:36:34 -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
Baligh Uddin
39df7209b1 Import translations. DO NOT MERGE 
Change-Id: I11cded1dd334b8088faa24a66c66341fe0e0f38d
Auto-generated-cl: translation import
 2014-09-20 12:57:53 -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
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
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
Christopher Ferris
4cbee7d24d am b7442bbc: Merge "Remove MALLOC_LEAK_CHECK references." 
* commit 'b7442bbc8c27b0643b7235076ee151b8257bf28d':
  Remove MALLOC_LEAK_CHECK references.
 2014-09-20 01:30:36 +00:00
Yigit Boyar
1a74dc4547 Merge "Find activity from context in menu inflator for click events" into lmp-dev 2014-09-20 01:30:00 +00:00
Jeff Brown
e8e3125eeb am 09395677: Merge "Decouple turning screen on from waking up in policy." into lmp-dev 
* commit '09395677f7ef5119556e8ba100c0bd27480c9797':
  Decouple turning screen on from waking up in policy.
 2014-09-20 01:27:03 +00:00
Jeff Brown
76eb0a5b79 am 6d098d40: Merge "Fix order of operations while pulsing the ambient display." into lmp-dev 
* commit '6d098d406305bb6f34d48ce6035ba3920659a805':
  Fix order of operations while pulsing the ambient display.
 2014-09-20 01:26:59 +00:00
Jeff Brown
044af2d4f5 am f10fc92c: Merge "Ensure that the screen on blocker is applied while dozing." into lmp-dev 
* commit 'f10fc92c564048b51f1775fe92738669d358fa16':
  Ensure that the screen on blocker is applied while dozing.
 2014-09-20 01:26:54 +00:00
Christopher Ferris
b7442bbc8c Merge "Remove MALLOC_LEAK_CHECK references." 2014-09-20 01:23:27 +00:00
Jeff Brown
6e53b7476e Merge "Decouple turning screen on from waking up in policy." into lmp-dev 2014-09-20 01:09:40 +00:00
Jeff Brown
7858a1b5d8 Merge "Fix order of operations while pulsing the ambient display." into lmp-dev 2014-09-20 01:09:10 +00:00
Jeff Brown
1ecada8582 Merge "Ensure that the screen on blocker is applied while dozing." into lmp-dev 2014-09-20 01:08:52 +00:00
Christopher Ferris
9244436a05 Remove MALLOC_LEAK_CHECK references. 
Bug: 17378595
Change-Id: Ie7f8af88c7f3b0c3dc2c2e75bbaaa9e6a81269ae
 2014-09-19 18:08:29 -07:00
Christopher Tate
396cc75319 am 4cd2c811: am ebff637b: am c9a016dd: Merge "Always give wifi a chance to quiet down during restore" into lmp-dev 
* commit '4cd2c8117174d0692b79f8346706f193d7242c3d':
  Always give wifi a chance to quiet down during restore
 2014-09-20 00:55:45 +00:00