Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / a39e97aaf30ef3774a3a3c6de7ba701f1509b3b3
  1. a39e97a resolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227 am: 34377e0357 am: 68cce397b3 am: 4453c3cda2 am: 79a32d0a8a -s ours am: 9c358ccbe2 -s ours am: 72bbe1d631 -s ours by Tony Mak · 8 years ago
  2. 77a3aed resolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227 am: 34377e0357 am: 68cce397b3 am: 4453c3cda2 am: 79a32d0a8a -s ours am: 9c358ccbe2 -s ours by Tony Mak · 8 years ago
  3. 72bbe1d resolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227 am: 34377e0357 am: 68cce397b3 am: 4453c3cda2 am: 79a32d0a8a -s ours by Tony Mak · 8 years ago
  4. 9b64717 Merge "Work around issue #65333586: Took phone out of pocket..." into oc-mr1-dev by Dianne Hackborn · 8 years ago
  5. 9c358cc resolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227 am: 34377e0357 am: 68cce397b3 am: 4453c3cda2 by Tony Mak · 8 years ago
  6. f04b643 Merge "Work around issue #65333586: Took phone out of pocket..." into oc-mr1-dev by TreeHugger Robot · 8 years ago
  7. 79a32d0 resolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227 am: 34377e0357 am: 68cce397b3 by Tony Mak · 8 years ago
  8. 4453c3c resolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227 am: 34377e0357 by Tony Mak · 8 years ago
  9. 68cce39 resolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227 am: 34377e0357 by Tony Mak · 8 years ago
  10. 34377e0 resolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227 by Tony Mak · 8 years ago
  11. d7dcc3e resolve merge conflicts of 56a2b529373b to nyc-dev by Tony Mak · 8 years ago
  12. ddb8ced Merge "TextView longpress 2 haptic feedback fix" into oc-mr1-dev am: 04b6095082 by Andrei Stingaceanu · 8 years ago
  13. 04b6095 Merge "TextView longpress 2 haptic feedback fix" into oc-mr1-dev by Andrei Stingaceanu · 8 years ago
  14. 56a2b52 Merge "DPC should not be allowed to grant development permission" into mnc-dev am: 328c129f4c am: a1cbcf5513 by Tony Mak · 8 years ago
  15. 220e7c1 Merge "DPC should not be allowed to grant development permission" into mnc-dev am: 328c129f4c by Tony Mak · 8 years ago
  16. a1cbcf5 Merge "DPC should not be allowed to grant development permission" into mnc-dev by Tony Mak · 8 years ago
  17. 328c129 Merge "DPC should not be allowed to grant development permission" into mnc-dev by TreeHugger Robot · 8 years ago
  18. 6897619 Merge "TV PIP: Keep the PIP at the bottom for RTL language" into oc-mr1-dev by Jaewan Kim · 8 years ago
  19. 1b0ca08 Merge "TV PIP: Keep the PIP at the bottom for RTL language" into oc-mr1-dev by TreeHugger Robot · 8 years ago
  20. 43d774f Merge "Clearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b308361 am: 54f494ffc0 am: 4b8fb78007 -s ours am: 3f824a362f -s ours am: 467ed9d15a -s ours am: 6a48feaab8 -s ours am: 67f43835ad -s ours am: 3beb50ba24 -s ours am: d5c753a6e5 -s ours am: 81f4636ffa -s ours am: ac5fb9ab78 -s ours" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  21. 1e31dd5 Clearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b308361 am: 54f494ffc0 am: 4b8fb78007 -s ours am: 3f824a362f -s ours am: 467ed9d15a -s ours am: 6a48feaab8 -s ours am: 67f43835ad -s ours am: 3beb50ba24 -s ours am: d5c753a6e5 -s ours am: 81f4636ffa -s ours by Suprabh Shukla · 8 years ago
  22. cf29f4f Clearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b308361 am: 54f494ffc0 am: 4b8fb78007 -s ours am: 3f824a362f -s ours am: 467ed9d15a -s ours am: 6a48feaab8 -s ours am: 67f43835ad -s ours am: 3beb50ba24 -s ours am: d5c753a6e5 -s ours am: 81f4636ffa -s ours by Suprabh Shukla · 8 years ago
  23. ac5fb9a Clearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b308361 am: 54f494ffc0 am: 4b8fb78007 -s ours am: 3f824a362f -s ours am: 467ed9d15a -s ours am: 6a48feaab8 -s ours am: 67f43835ad -s ours am: 3beb50ba24 -s ours am: d5c753a6e5 -s ours by Suprabh Shukla · 8 years ago
  24. 6ccf40b Clearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b308361 am: 54f494ffc0 am: 4b8fb78007 -s ours am: 3f824a362f -s ours am: 467ed9d15a -s ours am: 6a48feaab8 -s ours am: 67f43835ad -s ours am: 3beb50ba24 -s ours am: d5c753a6e5 -s ours by Suprabh Shukla · 8 years ago
  25. 81f4636 Clearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b308361 am: 54f494ffc0 am: 4b8fb78007 -s ours am: 3f824a362f -s ours am: 467ed9d15a -s ours am: 6a48feaab8 -s ours am: 67f43835ad -s ours am: 3beb50ba24 -s ours by Suprabh Shukla · 8 years ago
  26. d5c753a Clearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b308361 am: 54f494ffc0 am: 4b8fb78007 -s ours am: 3f824a362f -s ours am: 467ed9d15a -s ours am: 6a48feaab8 -s ours am: 67f43835ad -s ours by Suprabh Shukla · 8 years ago
  27. 3beb50b Clearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b308361 am: 54f494ffc0 am: 4b8fb78007 -s ours am: 3f824a362f -s ours am: 467ed9d15a -s ours am: 6a48feaab8 -s ours by Suprabh Shukla · 8 years ago
  28. 67f4383 Clearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b308361 am: 54f494ffc0 am: 4b8fb78007 -s ours am: 3f824a362f -s ours am: 467ed9d15a -s ours by Suprabh Shukla · 8 years ago
  29. 6a48fea Clearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b308361 am: 54f494ffc0 am: 4b8fb78007 -s ours am: 3f824a362f -s ours by Suprabh Shukla · 8 years ago
  30. 467ed9d Clearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b308361 am: 54f494ffc0 am: 4b8fb78007 -s ours by Suprabh Shukla · 8 years ago
  31. 3f824a3 Clearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b308361 am: 54f494ffc0 by Suprabh Shukla · 8 years ago
  32. 6a4e1d0 Merge "DPC should not be allowed to grant development permission" into oc-dev am: 5e4b2b15ec am: f1aea743fd by Tony Mak · 8 years ago
  33. ebb4cf4 Merge "Merge "DPC should not be allowed to grant development permission" into oc-dev am: 5e4b2b15ec am: f1aea743fd am: 0b80fb29b1" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  34. 5750c35 Merge "DPC should not be allowed to grant development permission" into oc-dev am: 5e4b2b15ec am: f1aea743fd by Tony Mak · 8 years ago
  35. 957bb65 Merge "Deprecate TelephonyManager APIs which are present in TelecomManager." am: a90205492f am: f0dd39f7d0 by Sanket Padawe · 8 years ago
  36. d3d23ce Merge "DPC should not be allowed to grant development permission" into oc-dev am: 5e4b2b15ec by Tony Mak · 8 years ago
  37. 0b80fb2 Merge "DPC should not be allowed to grant development permission" into oc-dev am: 5e4b2b15ec by Tony Mak · 8 years ago
  38. b706659 Merge "Deprecate TelephonyManager APIs which are present in TelecomManager." am: a90205492f by Sanket Padawe · 8 years ago
  39. f1aea74 Merge "DPC should not be allowed to grant development permission" into oc-dev by Tony Mak · 8 years ago
  40. f0dd39f Merge "Deprecate TelephonyManager APIs which are present in TelecomManager." by Sanket Padawe · 8 years ago
  41. a902054 Merge "Deprecate TelephonyManager APIs which are present in TelecomManager." by Sanket Padawe · 8 years ago
  42. 5e4b2b1 Merge "DPC should not be allowed to grant development permission" into oc-dev by TreeHugger Robot · 8 years ago
  43. f1923717 Merge "Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am: fc9e382229 am: 7d9e844124 am: 25ec24740b am: 4f31a88d4b am: bf1b7e9030 -s ours am: 84aa3f4c81 -s ours am: a8e0d5f73a -s ours am: 05c679e9fa -s ours" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  44. ea568d0 Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am: fc9e382229 am: 7d9e844124 am: 25ec24740b am: 4f31a88d4b am: bf1b7e9030 -s ours am: 84aa3f4c81 -s ours am: a8e0d5f73a -s ours by Suprabh Shukla · 8 years ago
  45. 8f440f9 Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am: fc9e382229 am: 7d9e844124 am: 25ec24740b am: 4f31a88d4b am: bf1b7e9030 -s ours am: 84aa3f4c81 -s ours am: a8e0d5f73a -s ours by Suprabh Shukla · 8 years ago
  46. 05c679e Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am: fc9e382229 am: 7d9e844124 am: 25ec24740b am: 4f31a88d4b am: bf1b7e9030 -s ours am: 84aa3f4c81 -s ours by Suprabh Shukla · 8 years ago
  47. 5683805 Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am: fc9e382229 am: 7d9e844124 am: 25ec24740b am: 4f31a88d4b am: bf1b7e9030 -s ours am: 84aa3f4c81 -s ours by Suprabh Shukla · 8 years ago
  48. a8e0d5f Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am: fc9e382229 am: 7d9e844124 am: 25ec24740b am: 4f31a88d4b am: bf1b7e9030 -s ours by Suprabh Shukla · 8 years ago
  49. 84aa3f4 Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am: fc9e382229 am: 7d9e844124 am: 25ec24740b am: 4f31a88d4b by Suprabh Shukla · 8 years ago
  50. bf1b7e9 Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am: fc9e382229 am: 7d9e844124 am: 25ec24740b by Suprabh Shukla · 8 years ago
  51. 4f31a88 Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am: fc9e382229 am: 7d9e844124 by Suprabh Shukla · 8 years ago
  52. 4b8fb78 Clearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b308361 by Suprabh Shukla · 8 years ago
  53. 25ec247 Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am: fc9e382229 by Suprabh Shukla · 8 years ago
  54. 54f494ff Clearing up invalid entries when SyncStorageEngine starts am: 5470469d73 by Suprabh Shukla · 8 years ago
  55. 7d9e844 Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev by Suprabh Shukla · 8 years ago
  56. bf1b308 Clearing up invalid entries when SyncStorageEngine starts am: 5470469d73 by Suprabh Shukla · 8 years ago
  57. fc9e382 Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev by TreeHugger Robot · 8 years ago
  58. 61079e7 Merge "tests: remove LOCAL_CLANG" am: e77be9c610 am: 24b36003d4 am: 7599be2e67 by Lennart Wieboldt · 8 years ago
  59. 7599be2 Merge "tests: remove LOCAL_CLANG" am: e77be9c610 am: 24b36003d4 by Lennart Wieboldt · 8 years ago
  60. 24b3600 Merge "tests: remove LOCAL_CLANG" am: e77be9c610 by Lennart Wieboldt · 8 years ago
  61. e77be9c Merge "tests: remove LOCAL_CLANG" by Treehugger Robot · 8 years ago
  62. 9eb1bc0 tests: remove LOCAL_CLANG by Lennart Wieboldt · 8 years ago
  63. b0b685b Merge "Revert "Remove a compat hack SurfaceView#setWindowType()"" into oc-mr1-dev by Yohei Yukawa · 8 years ago
  64. a729236 Merge "Revert "Remove a compat hack SurfaceView#setWindowType()"" into oc-mr1-dev by TreeHugger Robot · 8 years ago
  65. 4cefd85d Merge "Documented use of AutofillManager.notifyViewVisibilityChanged()" into oc-mr1-dev by Felipe Leme · 8 years ago
  66. beff427 Merge "Documented use of AutofillManager.notifyViewVisibilityChanged()" into oc-mr1-dev by TreeHugger Robot · 8 years ago
  67. 2e9ec5f Merge changes I93cf24d4,I32e438ef am: 30798ad13a am: c28d591b36 am: 59225490b8 by Dan Willemsen · 8 years ago
  68. ac2e9ba Rename aapt_defaults to aapt2_defaults am: 1cb5ab2dc1 -s ours am: 972a9d5318 -s ours by Dan Willemsen · 8 years ago
  69. 5922549 Merge changes I93cf24d4,I32e438ef am: 30798ad13a am: c28d591b36 by Dan Willemsen · 8 years ago
  70. 0ebd09b Rename aapt_defaults to aapt2_defaults am: 1cb5ab2dc1 -s ours by Dan Willemsen · 8 years ago
  71. bfac747 Merge "Convert libhidcommand_jni to Android.bp" am: 5a1e85eb71 -s ours am: 4731cc66e9 -s ours by Dan Willemsen · 8 years ago
  72. c28d591b Merge changes I93cf24d4,I32e438ef am: 30798ad13a by Dan Willemsen · 8 years ago
  73. 972a9d5 Rename aapt_defaults to aapt2_defaults am: 1cb5ab2dc1 -s ours by Dan Willemsen · 8 years ago
  74. 6a8d767 Merge "Convert libhidcommand_jni to Android.bp" am: 5a1e85eb71 -s ours by Dan Willemsen · 8 years ago
  75. 30798ad Merge changes I93cf24d4,I32e438ef by Treehugger Robot · 8 years ago
  76. 4731cc6 Merge "Convert libhidcommand_jni to Android.bp" am: 5a1e85eb71 -s ours by Dan Willemsen · 8 years ago
  77. 5a1e85e Merge "Convert libhidcommand_jni to Android.bp" by Treehugger Robot · 8 years ago
  78. 9309c19 Revert "Remove a compat hack SurfaceView#setWindowType()" by Yohei Yukawa · 8 years ago
  79. 4086d3f Merge "Convert incident_report and incident-section-gen to Android.bp" am: d928842ab6 am: 24041fe213 by Dan Willemsen · 8 years ago
  80. 950eeb2 Merge "Convert incident_report and incident-section-gen to Android.bp" am: d928842ab6 by Dan Willemsen · 8 years ago
  81. 24041fe Merge "Convert incident_report and incident-section-gen to Android.bp" by Dan Willemsen · 8 years ago
  82. d928842 Merge "Convert incident_report and incident-section-gen to Android.bp" by Treehugger Robot · 8 years ago
  83. eb211c2 Merge changes Ia3bcece1,Icd26dc1e am: ec462238f6 am: c201a6bb7d am: 9539d236e7 by Dan Willemsen · 8 years ago
  84. f1ae466 Merge "Convert libhidcommand_jni to Android.bp" into stage-aosp-master am: a97f4d4ac3 by Dan Willemsen · 8 years ago
  85. 9539d23 Merge changes Ia3bcece1,Icd26dc1e am: ec462238f6 am: c201a6bb7d by Dan Willemsen · 8 years ago
  86. 0b4a027 Rename aapt_defaults to aapt2_defaults am: 7544b9cbb9 am: 6737dc9448 by Dan Willemsen · 8 years ago
  87. 21d5fdb Merge "Convert libhidcommand_jni to Android.bp" into stage-aosp-master by Dan Willemsen · 8 years ago
  88. c201a6b Merge changes Ia3bcece1,Icd26dc1e am: ec462238f6 by Dan Willemsen · 8 years ago
  89. 760d57a Convert incident_report and incident-section-gen to Android.bp by Dan Willemsen · 8 years ago
  90. 392d4e7 Convert libhidcommand_jni to Android.bp by Dan Willemsen · 8 years ago
  91. 6737dc9 Rename aapt_defaults to aapt2_defaults am: 7544b9cbb9 by Dan Willemsen · 8 years ago
  92. ec46223 Merge changes Ia3bcece1,Icd26dc1e by Dan Willemsen · 8 years ago
  93. a97f4d4 Merge "Convert libhidcommand_jni to Android.bp" into stage-aosp-master by Dan Willemsen · 8 years ago
  94. 2dae0e2 Merge "Convert incident_report and incident-section-gen to Android.bp" into oc-mr1-dev-plus-aosp by Dan Willemsen · 8 years ago
  95. c59aef0 Merge "Don't log TYPE_DATASET_SELECTED on dataset authentication." into oc-mr1-dev by Felipe Leme · 8 years ago
  96. 627cc3c Merge "Don't log TYPE_DATASET_SELECTED on dataset authentication." into oc-mr1-dev by TreeHugger Robot · 8 years ago
  97. eadf1ab Merge "Destroy Save UI when it's hidden without a pending restoration." into oc-mr1-dev by Felipe Leme · 8 years ago
  98. 415c7aa Merge "Destroy Save UI when it's hidden without a pending restoration." into oc-mr1-dev by TreeHugger Robot · 8 years ago
  99. fc6d511 Convert incident_report and incident-section-gen to Android.bp by Dan Willemsen · 8 years ago
  100. 8119ffa Convert libhidcommand_jni to Android.bp by Dan Willemsen · 8 years ago