Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_frameworks_base / 10102e4c0e501333a12b38a5cfe709d1558d84dd
  1. 10102e4 resolved conflicts for merge of baaa080b to master by Jeff Brown · 11 years ago
  2. 1a405db Merge "Abort removing account if prohibited by policy" by Amith Yamasani · 11 years ago
  3. 5934dbc Abort removing account if prohibited by policy by Amith Yamasani · 11 years ago
  4. 949131b am 17b7705a: (-s ours) am fbb100c4: (-s ours) am ea17c636: (-s ours) am 4292ce5d: (-s ours) am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  5. d87e57f am c87c6a2a: (-s ours) am a69996e4: (-s ours) am 701449e8: (-s ours) am c9443fc5: (-s ours) am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  6. 983f053 am 46f1744a: (-s ours) am 2f07a705: (-s ours) am 50d0afa4: (-s ours) am 2f5347ee: (-s ours) am 1af20cc5: (-s ours) am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  7. c038cd9 am e16fe1aa: (-s ours) am 13e85016: (-s ours) am 749e6b9c: (-s ours) am 5da96060: (-s ours) am f887a67d: (-s ours) am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  8. 7278142 am e9a5424c: (-s ours) am a935d31c: (-s ours) am bf2226ec: (-s ours) am 8b297fb6: (-s ours) am 8027100f: (-s ours) am e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  9. f8ecdd0 am 54de3ec2: (-s ours) am 72edb1b7: (-s ours) am 699991c8: (-s ours) am 08394af2: (-s ours) am e69b7b34: (-s ours) am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  10. 92d5a67d am 7d236199: (-s ours) am 21c5c8e6: am 9edf7a11: am 2cb9147f: am 55542ee6: am 3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev by Xavier Ducrohet · 11 years ago
  11. 62b6062 am 7b5d0a82: (-s ours) am c139177b: am 65521c3c: am ca4b9a77: am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  12. 0be0a50 am 7206ac56: am a79ac472: am 744d3473: Merge "Add hardware feature describing a watch." into klp-modular-dev by Justin Koh · 11 years ago
  13. d85e784 Merge "Fix density in touch feedback drawable" by Alan Viverette · 11 years ago
  14. cb29189 Fix density in touch feedback drawable by Alan Viverette · 11 years ago
  15. a50d7cf am 66e30b35: am c95ed621: am fca204a4: am 05cebdc2: Merge "Fix several bad function definitions." by Narayan Kamath · 11 years ago
  16. 3fa48a2 am fb7b3181: (-s ours) am 520a5673: am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compatible" by Narayan Kamath · 11 years ago
  17. baaa080 am 90506a41: am 07e6d1b9: Merge "Add a new "doze mode" based on Dream components." into klp-modular-dev by Jeff Brown · 11 years ago
  18. 90506a4 am 07e6d1b9: Merge "Add a new "doze mode" based on Dream components." into klp-modular-dev by Jeff Brown · 11 years ago
  19. 07e6d1b Merge "Add a new "doze mode" based on Dream components." into klp-modular-dev by Jeff Brown · 11 years ago
  20. 2687550 Add a new "doze mode" based on Dream components. by Jeff Brown · 11 years ago
  21. f9bf991 am bcb433b4: am b1903653: am 128599e4: am 2b3c14bf: Merge "libandroidfw: fix build error for 64-bit" by Narayan Kamath · 11 years ago
  22. 83b6e4b am 5ef8d14d: am 72eff55b: am d43ad2f3: am 4c68c4ed: am 24a8e1d0: am af87e19b: Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs by Scott Main · 11 years ago
  23. 2f2c0e7 Merge "Fix NPE in layer destruction" by John Reck · 11 years ago
  24. 6b3c411 Fix NPE in layer destruction by John Reck · 11 years ago
  25. 96f0369 Merge "Update framework to enable Skia to run in debug mode." by Derek Sollenberger · 11 years ago
  26. 40c3ddd Merge "Make deliverInputEvent tracing asynchronous" by Michael Wright · 11 years ago
  27. 2d5cf4f Update framework to enable Skia to run in debug mode. by Derek Sollenberger · 11 years ago
  28. 17b7705 am fbb100c4: (-s ours) am ea17c636: (-s ours) am 4292ce5d: (-s ours) am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  29. c87c6a2 am a69996e4: (-s ours) am 701449e8: (-s ours) am c9443fc5: (-s ours) am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  30. fbb100c am ea17c636: (-s ours) am 4292ce5d: (-s ours) am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  31. a69996e am 701449e8: (-s ours) am c9443fc5: (-s ours) am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  32. ea17c63 am 4292ce5d: (-s ours) am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  33. 701449e am c9443fc5: (-s ours) am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  34. 09fcce5 Merge "Add ability to obtain themed Drawable from Context" by Deepanshu Gupta · 11 years ago
  35. 4292ce5 am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  36. c9443fc am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  37. 810267c am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  38. 8ca432c am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  39. 28009e8 Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  40. c2803d4 Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  41. 46f1744 am 2f07a705: (-s ours) am 50d0afa4: (-s ours) am 2f5347ee: (-s ours) am 1af20cc5: (-s ours) am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  42. 2f07a70 am 50d0afa4: (-s ours) am 2f5347ee: (-s ours) am 1af20cc5: (-s ours) am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  43. e16fe1a am 13e85016: (-s ours) am 749e6b9c: (-s ours) am 5da96060: (-s ours) am f887a67d: (-s ours) am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  44. e9a5424 am a935d31c: (-s ours) am bf2226ec: (-s ours) am 8b297fb6: (-s ours) am 8027100f: (-s ours) am e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  45. 54de3ec am 72edb1b7: (-s ours) am 699991c8: (-s ours) am 08394af2: (-s ours) am e69b7b34: (-s ours) am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  46. 50d0afa am 2f5347ee: (-s ours) am 1af20cc5: (-s ours) am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  47. 13e8501 am 749e6b9c: (-s ours) am 5da96060: (-s ours) am f887a67d: (-s ours) am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  48. a935d31 am bf2226ec: (-s ours) am 8b297fb6: (-s ours) am 8027100f: (-s ours) am e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  49. 72edb1b am 699991c8: (-s ours) am 08394af2: (-s ours) am e69b7b34: (-s ours) am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  50. 2f5347e am 1af20cc5: (-s ours) am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  51. 749e6b9 am 5da96060: (-s ours) am f887a67d: (-s ours) am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  52. bf2226e am 8b297fb6: (-s ours) am 8027100f: (-s ours) am e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  53. 699991c am 08394af2: (-s ours) am e69b7b34: (-s ours) am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  54. 1af20cc am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  55. 5da9606 am f887a67d: (-s ours) am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  56. 8b297fb am 8027100f: (-s ours) am e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  57. 08394af am e69b7b34: (-s ours) am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  58. f887a67 am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  59. 8027100 am e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  60. e69b7b3 am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  61. 554b43a Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  62. 7d23619 am 21c5c8e6: am 9edf7a11: am 2cb9147f: am 55542ee6: am 3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev by Xavier Ducrohet · 11 years ago
  63. 7b5d0a8 am c139177b: am 65521c3c: am ca4b9a77: am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  64. aa20b27 Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  65. e9adafd Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  66. 46a0224 Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  67. 21c5c8e am 9edf7a11: am 2cb9147f: am 55542ee6: am 3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev by Xavier Ducrohet · 11 years ago
  68. c139177 am 65521c3c: am ca4b9a77: am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  69. 9edf7a1 am 2cb9147f: am 55542ee6: am 3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev by Xavier Ducrohet · 11 years ago
  70. 65521c3 am ca4b9a77: am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  71. 7206ac5 am a79ac472: am 744d3473: Merge "Add hardware feature describing a watch." into klp-modular-dev by Justin Koh · 11 years ago
  72. 2cb9147 am 55542ee6: am 3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev by Xavier Ducrohet · 11 years ago
  73. ca4b9a7 am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  74. 55542ee am 3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev by Xavier Ducrohet · 11 years ago
  75. e92c854 am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  76. a79ac47 am 744d3473: Merge "Add hardware feature describing a watch." into klp-modular-dev by Justin Koh · 11 years ago
  77. 3e63704 Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev by Xavier Ducrohet · 11 years ago
  78. 744d347 Merge "Add hardware feature describing a watch." into klp-modular-dev by Justin Koh · 11 years ago
  79. 66e30b3 am c95ed621: am fca204a4: am 05cebdc2: Merge "Fix several bad function definitions." by Narayan Kamath · 11 years ago
  80. fb7b318 am 520a5673: am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compatible" by Narayan Kamath · 11 years ago
  81. c95ed62 am fca204a4: am 05cebdc2: Merge "Fix several bad function definitions." by Narayan Kamath · 11 years ago
  82. 520a567 am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compatible" by Narayan Kamath · 11 years ago
  83. fca204a am 05cebdc2: Merge "Fix several bad function definitions." by Narayan Kamath · 11 years ago
  84. b152473 am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compatible" by Narayan Kamath · 11 years ago
  85. 05cebdc Merge "Fix several bad function definitions." by Narayan Kamath · 11 years ago
  86. 9fce853 Merge "AArch64: Make AssetAtlasService 64-bit compatible" by Narayan Kamath · 11 years ago
  87. 047b938 Fix several bad function definitions. by Narayan Kamath · 11 years ago
  88. 4de3f48 AArch64: Make AssetAtlasService 64-bit compatible by Ashok Bhat · 11 years ago
  89. bcb433b am b1903653: am 128599e4: am 2b3c14bf: Merge "libandroidfw: fix build error for 64-bit" by Narayan Kamath · 11 years ago
  90. b190365 am 128599e4: am 2b3c14bf: Merge "libandroidfw: fix build error for 64-bit" by Narayan Kamath · 11 years ago
  91. 128599e am 2b3c14bf: Merge "libandroidfw: fix build error for 64-bit" by Narayan Kamath · 11 years ago
  92. 2b3c14b Merge "libandroidfw: fix build error for 64-bit" by Narayan Kamath · 11 years ago
  93. 443dd93 libandroidfw: fix build error for 64-bit by Patrik Bannura · 11 years ago
  94. 6fb89ba Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  95. dab7a9e Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  96. b3425a6 Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  97. c4f6c35 Merge "use min app launch time in AppLaunch perf test" by Guang Zhu · 11 years ago
  98. d2c3adc Make deliverInputEvent tracing asynchronous by Michael Wright · 11 years ago
  99. 2861a89 use min app launch time in AppLaunch perf test by Guang Zhu · 11 years ago
  100. da799ef Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago