Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_frameworks_base / f67d4bafee9ab60912add98ad4ec0697d3e231fc
  1. f67d4ba Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  2. 1c3abee Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  3. f2e2907 Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  4. 6ed39c0 Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  5. eb17f6a Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  6. 77c6112 Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  7. 0a73f6f Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  8. c57b410 Add a script to rename fonts for SDK. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  9. 80e84e2 am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore by Robert Ly · 11 years ago
  10. f3cecfa am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore by Robert Ly · 11 years ago
  11. 55d525b am 716cc7dc: Add documentation for AndroidKeyStore by Robert Ly · 11 years ago
  12. 20c5ce5 Handle provisioning APN by turning off/on radio. by Amit Mahajan · 11 years ago
  13. 5cde33a am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  14. dcfba78 am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  15. ed5ab0f am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  16. 022d8a9 am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  17. bad112f am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  18. c8235b8 am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  19. 0ed9d49 am 328b1f92: (-s ours) am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  20. a9e8291 Merge branch 'klp-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev by Deepanshu Gupta · 11 years ago
  21. d49f9b2 am 2983ee55: (-s ours) am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  22. ab6c61b Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into klp-dev by Deepanshu Gupta · 11 years ago
  23. ffcad24 am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  24. 328b1f9 am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  25. 2983ee5 am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  26. 904b89c am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  27. 5d3e385 am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  28. 12b657d am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  29. 295184b am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  30. af3f96e am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  31. dade24b Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  32. e87c63e am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  33. 8782a12 resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  34. d2dff39 am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  35. b1ca2a0 am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  36. 61fb578 am 3ff08eb6: Distinguish between menus in ActionBar and popup. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  37. f52fcc7 Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  38. 5f664a1 am 2a57694d: (-s ours) am e2edd753: am 76364c69: am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  39. 2a57694 am e2edd753: am 76364c69: am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  40. e2edd75 am 76364c69: am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  41. 76364c6 am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  42. d0f2157 am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  43. b97ac2b am c8414f11: (-s ours) am 4dcb4a1f: am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  44. fb6e2f3 am 9bfbe93a: (-s ours) am dd46bfd0: am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  45. c8414f1 am 4dcb4a1f: am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  46. 9bfbe93 am dd46bfd0: am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  47. 3c1d72c am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  48. 4dcb4a1 am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  49. dd46bfd am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  50. ab869de am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  51. 236b716 am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  52. 02d88f7 am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  53. cd192c0b am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  54. d056218 am 661e158b: (-s ours) am 2ac96a09: am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  55. 0ab0d87 am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  56. ffbf244 am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  57. 704954c am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  58. 661e158 am 2ac96a09: am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  59. 28f550f am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  60. 083af20 am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  61. 5f56ea8 am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  62. 2ac96a0 am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  63. 03a8326 am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  64. f48ab8f am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  65. 531bdb5 am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  66. 3ff08eb6 Distinguish between menus in ActionBar and popup. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  67. 3b7c09b LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  68. 03c0735 Distinguish between menus in ActionBar and popup. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  69. 08d2007 LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  70. fe6f304 Remove @NonNull attribute [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  71. 866d40f Distinguish between menus in ActionBar and popup. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  72. a0fc1f4 LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  73. 79f45b4 Distinguish between menus in ActionBar and popup. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  74. 8974a5e LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  75. 607d599 Fix crash in widget pager - DO NOT MERGE by Jim Miller · 11 years ago
  76. 9916c17 am 472cbad4: am f57871f7: am 888dad0d: am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  77. 3a559d5 am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 11 years ago
  78. 472cbad am f57871f7: am 888dad0d: am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  79. b5b4756 am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 11 years ago
  80. f57871f am 888dad0d: am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  81. 98822f0 am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 11 years ago
  82. 888dad0 am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  83. 6e923e1 am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 11 years ago
  84. f33a2f6 am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  85. 90d5772 am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 11 years ago
  86. f5af9a4 am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  87. 209745a am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 11 years ago
  88. 273c5c3 am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  89. c251147 am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 11 years ago
  90. 9ca7a03 resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  91. 85ec144 am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 11 years ago
  92. e0be42a am 40bfb60e: Fix build due to incorrect merges [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  93. f266873 am 1c55797d: Fix build by Deepanshu Gupta · 11 years ago
  94. 40bfb60 Fix build due to incorrect merges [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  95. 1c55797 Fix build by Deepanshu Gupta · 11 years ago
  96. fea4b4d am 3450dc32: am 06018d92: am f41a380b: am d10ca17d: am 8921409a: am 10fb4fe4: am d99dd3e7: am 70efbad0: am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp by Deepanshu Gupta · 11 years ago
  97. 69ab594 am fcfb8801: am 18b1525a: am ef24a509: am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  98. cdc40eb am 6fd1703e: (-s ours) am 0d33f604: am 4dff881b: am 7b9cc710: (-s ours) am 9c7e3064: am 1b0f6056: am c1847b54: am 5454be00: am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  99. c909b4d am 2322a910: am 75fc74d6: am 203964c0: am b7e1bef1: am b607cb82: am 27c9b568: am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  100. 86726f5 am eb5b38b1: (-s ours) am a350f96e: am 0eb268a0: am 22dabb52: (-s ours) am c261cb0d: am f354d01a: am aab60856: am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] by Deepanshu Gupta · 11 years ago