Gitiles
Code Review Sign In
review.blissroms.org / platform_packages_apps_Settings / 8994d1f0a44cf62ecac1f3a470f856651a34eda5
  1. 8994d1f Merge "Merge translations of Bluetooth confirmation text" into oc-dev by Atanas Kirilov · 7 years ago
  2. 9b4f552 Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev by Atanas Kirilov · 7 years ago
  3. 75f0072 Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev by Atanas Kirilov · 7 years ago
  4. 438cf9d Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev by Atanas Kirilov · 7 years ago
  5. 9e62673 Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev by Atanas Kirilov · 7 years ago
  6. 826b14e Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev by Atanas Kirilov · 7 years ago
  7. ba8ae71 Merge translations of Bluetooth confirmation text by Antony Sargent · 7 years ago
  8. 80381d7 [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa am: b176eaa85e am: e20b700ac1 by Android Build Merger (Role) · 7 years ago
  9. e20b700 [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa am: b176eaa85e by Android Build Merger (Role) · 7 years ago
  10. b176eaa [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa by Android Build Merger (Role) · 7 years ago
  11. 1871d3d [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f skipped: 93ee1bd17e skipped: 30d0145ead skipped: b9aa0fbfe9 by Android Build Merger (Role) · 7 years ago
  12. b9aa0fb [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f skipped: 93ee1bd17e skipped: 30d0145ead by Android Build Merger (Role) · 7 years ago
  13. 30d0145 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f skipped: 93ee1bd17e by Android Build Merger (Role) · 7 years ago
  14. 93ee1bd [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f by Android Build Merger (Role) · 7 years ago
  15. 551be9a [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f by Android Build Merger (Role) · 7 years ago
  16. 874c517 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 by Android Build Merger (Role) · 7 years ago
  17. cb66517 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 by Android Build Merger (Role) · 7 years ago
  18. 5b4de5e [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d by Android Build Merger (Role) · 7 years ago
  19. e0eeafc Merge translations of Bluetooth confirmation text by Antony Sargent · 7 years ago
  20. 6351f90 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 732b65ca4d by Android Build Merger (Role) · 7 years ago
  21. 732b65c Merge translations of Bluetooth confirmation text by Antony Sargent · 7 years ago
  22. 108cb3e [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a by Android Build Merger (Role) · 7 years ago
  23. a0b8f3f Merge translations of Bluetooth confirmation text by Antony Sargent · 7 years ago
  24. 81573c9 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293 skipped: e9345782e2 skipped: c874b450af by Android Build Merger (Role) · 7 years ago
  25. c874b45 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293 skipped: e9345782e2 by Android Build Merger (Role) · 7 years ago
  26. e934578 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293 by Android Build Merger (Role) · 7 years ago
  27. 7304aaf [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf by Android Build Merger (Role) · 7 years ago
  28. ed423ea [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 by Android Build Merger (Role) · 7 years ago
  29. e36ca3e DO NOT MERGE Give PBAP permission only after user confirms by Hansong Zhang · 7 years ago
  30. 3d99dc7 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e skipped: 2d1bae1bd8 skipped: 8bc91c3b8b skipped: 3e48235bf6 by Android Build Merger (Role) · 7 years ago
  31. 3e48235 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e skipped: 2d1bae1bd8 skipped: 8bc91c3b8b by Android Build Merger (Role) · 7 years ago
  32. 8bc91c3 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e skipped: 2d1bae1bd8 by Android Build Merger (Role) · 7 years ago
  33. 2d1bae1 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e by Android Build Merger (Role) · 7 years ago
  34. ba2ea1e [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 by Android Build Merger (Role) · 7 years ago
  35. 4a82795 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 by Android Build Merger (Role) · 7 years ago
  36. 3f8d33f Merge translations of Bluetooth confirmation text by Antony Sargent · 7 years ago
  37. 7d505ae Merge translations of Bluetooth confirmation text by Antony Sargent · 7 years ago
  38. 6a668c5 Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  39. 70643c1 Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into cw-f-dev by TreeHugger Robot · 7 years ago
  40. d59b0ed Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev by TreeHugger Robot · 7 years ago
  41. 8e2a3b1 Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into nyc-mr1-dev by TreeHugger Robot · 7 years ago
  42. 6b6d337 Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into nyc-dr1-dev by TreeHugger Robot · 7 years ago
  43. eeafbd8 Merge "DO NOT MERGE Fix unexpected behavior in Bluetooth pairing" into nyc-dev by TreeHugger Robot · 7 years ago
  44. 1990791 [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238 am: 7b2b84c617 skipped: b1f00ebf9c by Android Build Merger (Role) · 7 years ago
  45. b1f00eb [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238 am: 7b2b84c617 by Android Build Merger (Role) · 7 years ago
  46. 7b2b84c [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238 by Android Build Merger (Role) · 7 years ago
  47. ee220e0 [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc by Android Build Merger (Role) · 7 years ago
  48. e25ebdd [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa by Android Build Merger (Role) · 7 years ago
  49. 4f58c19 DO NOT MERGE Fix unexpected behavior in Bluetooth pairing by Hansong Zhang · 7 years ago
  50. c412707 [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1 am: 41be25548e skipped: 74ff24d1c6 by Android Build Merger (Role) · 7 years ago
  51. 74ff24d [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1 am: 41be25548e by Android Build Merger (Role) · 7 years ago
  52. 41be255 [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1 by Android Build Merger (Role) · 7 years ago
  53. 84061c7 [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 by Android Build Merger (Role) · 7 years ago
  54. bab8dca [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 by Android Build Merger (Role) · 7 years ago
  55. 5d27bdb [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 by Android Build Merger (Role) · 7 years ago
  56. d276b38 [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 by Android Build Merger (Role) · 7 years ago
  57. dfe4cc7 [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 by Android Build Merger (Role) · 7 years ago
  58. 5b98c9f [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 by Android Build Merger (Role) · 7 years ago
  59. ac6c49d DO NOT MERGE Fix unexpected behavior in Bluetooth pairing by Hansong Zhang · 7 years ago
  60. 5943908 [automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 skipped: 6827142bd1 skipped: ca801490c1 skipped: fb6a179745 by Android Build Merger (Role) · 7 years ago
  61. fb6a179 [automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 skipped: 6827142bd1 skipped: ca801490c1 by Android Build Merger (Role) · 7 years ago
  62. ca80149 [automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 skipped: 6827142bd1 by Android Build Merger (Role) · 7 years ago
  63. 6827142 [automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 by Android Build Merger (Role) · 7 years ago
  64. ddd9cb6 [automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff by Android Build Merger (Role) · 7 years ago
  65. 5755ec9 [automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 by Android Build Merger (Role) · 7 years ago
  66. eb76bf9 [automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 by Android Build Merger (Role) · 7 years ago
  67. 59ab695 [automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 by Android Build Merger (Role) · 7 years ago
  68. d923718 [automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 by Android Build Merger (Role) · 7 years ago
  69. 0a7ae11 Import translations. DO NOT MERGE by Antony Sargent · 7 years ago
  70. 26e5f82 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85 am: acacd658f1 by Antony Sargent · 8 years ago
  71. db6e747 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85 by Antony Sargent · 8 years ago
  72. acacd65 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 by Antony Sargent · 8 years ago
  73. 9867a3e Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 by Antony Sargent · 8 years ago
  74. 3d7dbd6 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 by Antony Sargent · 8 years ago
  75. 24f063a Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 by Antony Sargent · 8 years ago
  76. 9cf1fc7 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 by Antony Sargent · 8 years ago
  77. eee62e1 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 by Antony Sargent · 8 years ago
  78. b2b401b Reword bluetooth confirmation dialog am: e14d38a383 by Antony Sargent · 8 years ago
  79. e14d38a Reword bluetooth confirmation dialog by Antony Sargent · 8 years ago
  80. f20e0a4 Fix BluetoothPairingDialogTest to not expect device name by Antony Sargent · 8 years ago
  81. ef61a45 Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours am: 7690482014 -s ours am: dbbcf65c96 -s ours am: e6a8f354fc -s ours am: 3c19043e9c -s ours am: d15a81f882 -s ours by Fan Zhang · 8 years ago
  82. e981e0b Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours am: 7690482014 -s ours am: dbbcf65c96 -s ours am: e6a8f354fc -s ours am: 3c19043e9c -s ours by Fan Zhang · 8 years ago
  83. d15a81f Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours am: 7690482014 -s ours am: dbbcf65c96 -s ours am: e6a8f354fc -s ours by Fan Zhang · 8 years ago
  84. 3c19043 Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours am: 7690482014 -s ours am: dbbcf65c96 -s ours by Fan Zhang · 8 years ago
  85. e6a8f35 Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours am: 7690482014 -s ours by Fan Zhang · 8 years ago
  86. dbbcf65 Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours by Fan Zhang · 8 years ago
  87. 7690482 Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours by Fan Zhang · 8 years ago
  88. 5f02135 Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours by Fan Zhang · 8 years ago
  89. 1de093b Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours by Fan Zhang · 8 years ago
  90. b17703e Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev by Fan Zhang · 8 years ago
  91. 1c040c7 Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev by Fan Zhang · 8 years ago
  92. 1aefa25 Set device credential's Window flag to be SECURE. by Fan Zhang · 8 years ago
  93. 76f30a3 Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5 am: b4db530aa5 -s ours am: 0c0728a947 -s ours am: 4d9e11990d -s ours am: 3d94477fb8 -s ours am: 9d865d0c3e -s ours by Fan Zhang · 8 years ago
  94. 7da421a Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5 am: b4db530aa5 -s ours am: 0c0728a947 -s ours am: 4d9e11990d -s ours am: 3d94477fb8 -s ours by Fan Zhang · 8 years ago
  95. 9d865d0 Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5 am: b4db530aa5 -s ours am: 0c0728a947 -s ours am: 4d9e11990d -s ours by Fan Zhang · 8 years ago
  96. 3d94477 Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5 am: b4db530aa5 -s ours am: 0c0728a947 -s ours by Fan Zhang · 8 years ago
  97. 4d9e119 Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5 am: b4db530aa5 -s ours by Fan Zhang · 8 years ago
  98. 0c0728a Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5 by Fan Zhang · 8 years ago
  99. b4db530 Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 by Fan Zhang · 8 years ago
  100. 769e1e3 Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 by Fan Zhang · 8 years ago