Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / cts / 05809eb72adaaaefae2d8e897623288e9ce504af
  1. 05809eb Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r20" into marshmallow-cts-dev am: 34c68a07e2 -s ours am: 09e0424548 am: 0b3b5dccc6 am: 4b90a0a01e am: ff39a57d19 -s ours am: 0b1bbe3edc am: 975a7c4275 am: 00b57deea7 am: c2e0b37663 am: f6cb521189 -s ours am: 0f230de217" into oc-dev-plus-aosp am: 4a8e84979b" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  2. 93a982d Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r20" into marshmallow-cts-dev am: 34c68a07e2 -s ours am: 09e0424548 am: 0b3b5dccc6 am: 4b90a0a01e am: ff39a57d19 -s ours am: 0b1bbe3edc am: 975a7c4275 am: 00b57deea7 am: c2e0b37663 am: f6cb521189 -s ours am: 0f230de217" into oc-dev-plus-aosp by tinazh · 8 years ago
  3. 1eb6534 Merge "Merge "resolve merge conflicts of 6dabee4a94 to mnc-dev am: a03e8e4a34 am: 028e4e71b9 am: fdb36433cd am: a8b2cc5c00 -s ours am: d7cd8d3aee am: 5452012ee1 am: e957010b50 am: df7705b93f am: f4f58eb536 am: 522a5c1ce5" into oc-dev-plus-aosp am: 9e8605a845" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  4. aa1c34b Merge "resolve merge conflicts of 6dabee4a94 to mnc-dev am: a03e8e4a34 am: 028e4e71b9 am: fdb36433cd am: a8b2cc5c00 -s ours am: d7cd8d3aee am: 5452012ee1 am: e957010b50 am: df7705b93f am: f4f58eb536 am: 522a5c1ce5" into oc-dev-plus-aosp by Wei Jia · 8 years ago
  5. 2f48369 Merge "resolve merge conflicts of 6dabee4a94 to mnc-dev am: a03e8e4a34 am: 028e4e71b9 am: fdb36433cd am: a8b2cc5c00 -s ours am: d7cd8d3aee am: 5452012ee1 am: e957010b50 am: df7705b93f am: f4f58eb536 am: 522a5c1ce5 am: 8fe6058768" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  6. 592a307 resolve merge conflicts of 6dabee4a94 to mnc-dev am: a03e8e4a34 am: 028e4e71b9 am: fdb36433cd am: a8b2cc5c00 -s ours am: d7cd8d3aee am: 5452012ee1 am: e957010b50 am: df7705b93f am: f4f58eb536 am: 522a5c1ce5 by Wei Jia · 8 years ago
  7. d4a91f3 Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r21" into lollipop-mr1-cts-dev am: 3cf482f1aa -s ours" into marshmallow-cts-dev am: 2fe51274db -s ours am: 034b4fe6b3 am: c905e844e1 am: 6ffd506feb am: e14e19968b -s ours am: 86932477bb am: 2056de0f29 am: 065e20ae8c am: c4a2d29821 am: 9ee582f644 -s ours am: 851299d7cd am: dbcdfb24a2" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  8. 1010509 Merge "Merge "Merge changes from topic 'cp' into marshmallow-cts-dev am: 87c36ca3d1 -s ours am: 69e7430907 am: 646da50e62 am: 0e6a03eaba am: 8c4b357952 -s ours am: bb5072ba82 am: 3cded17ed3 am: ed846bbda7 am: c0439b2c9f am: 7bd593acdd" into oc-dev am: 7b2cf1a085 am: 97b605fd75" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  9. 32ac265 Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r21" into lollipop-mr1-cts-dev am: 3cf482f1aa -s ours" into marshmallow-cts-dev am: 2fe51274db -s ours am: 034b4fe6b3 am: c905e844e1 am: 6ffd506feb am: e14e19968b -s ours am: 86932477bb am: 2056de0f29 am: 065e20ae8c am: c4a2d29821 am: 9ee582f644 -s ours am: 851299d7cd by tinazh · 8 years ago
  10. 0024c50 Merge "Merge changes from topic 'cp' into marshmallow-cts-dev am: 87c36ca3d1 -s ours am: 69e7430907 am: 646da50e62 am: 0e6a03eaba am: 8c4b357952 -s ours am: bb5072ba82 am: 3cded17ed3 am: ed846bbda7 am: c0439b2c9f am: 7bd593acdd" into oc-dev am: 7b2cf1a085 by Marco Nelissen · 8 years ago
  11. f8ea7e2 Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r20" into marshmallow-cts-dev am: 34c68a07e2 -s ours am: 09e0424548 am: 0b3b5dccc6 am: 4b90a0a01e am: ff39a57d19 -s ours am: 0b1bbe3edc am: 975a7c4275 am: 00b57deea7 am: c2e0b37663 am: f6cb521189 -s ours am: 0f230de217 am: 14a1751c54" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  12. 147f219 Merge "Merge "Merge changes from topic 'am-4850ee14901a4a6997e3cf7eeda9eab8' into nyc-dev am: f7397fa77b am: dcb1312f44 am: 9f16e8bd64 am: 9582cf69ee am: e25511c063" into oc-dev am: 5aba424710 am: e5a6c51fd8" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  13. 4fd038b Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r20" into marshmallow-cts-dev am: 34c68a07e2 -s ours am: 09e0424548 am: 0b3b5dccc6 am: 4b90a0a01e am: ff39a57d19 -s ours am: 0b1bbe3edc am: 975a7c4275 am: 00b57deea7 am: c2e0b37663 am: f6cb521189 -s ours am: 0f230de217 by tinazh · 8 years ago
  14. 3688abf Merge "Merge changes from topic 'am-4850ee14901a4a6997e3cf7eeda9eab8' into nyc-dev am: f7397fa77b am: dcb1312f44 am: 9f16e8bd64 am: 9582cf69ee am: e25511c063" into oc-dev am: 5aba424710 by Wei Jia · 8 years ago
  15. 1b4e714 Merge "resolve merge conflicts of 6dabee4a94 to mnc-dev am: a03e8e4a34 am: 028e4e71b9 am: fdb36433cd am: a8b2cc5c00 -s ours am: d7cd8d3aee am: 5452012ee1 am: e957010b50 am: df7705b93f am: f4f58eb536 am: 522a5c1ce5 am: 0fbe29ad2a" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  16. f84697a Merge "Merge changes from topic 'am-4850ee14901a4a6997e3cf7eeda9eab8' into nyc-dev am: f7397fa77b am: dcb1312f44 am: 9f16e8bd64 am: 9582cf69ee am: e25511c063 am: 283ea8ff27 am: 1897b6e33f" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  17. 71bc4f5 resolve merge conflicts of 6dabee4a94 to mnc-dev am: a03e8e4a34 am: 028e4e71b9 am: fdb36433cd am: a8b2cc5c00 -s ours am: d7cd8d3aee am: 5452012ee1 am: e957010b50 am: df7705b93f am: f4f58eb536 am: 522a5c1ce5 by Wei Jia · 8 years ago
  18. e416a25 Merge changes from topic 'am-4850ee14901a4a6997e3cf7eeda9eab8' into nyc-dev am: f7397fa77b am: dcb1312f44 am: 9f16e8bd64 am: 9582cf69ee am: e25511c063 am: 283ea8ff27 by Wei Jia · 8 years ago
  19. a3e0281 Merge "Merge changes from topic 'cp' into marshmallow-cts-dev am: 87c36ca3d1 -s ours am: 69e7430907 am: 646da50e62 am: 0e6a03eaba am: 8c4b357952 -s ours am: bb5072ba82 am: 3cded17ed3 am: ed846bbda7 am: c0439b2c9f am: 7bd593acdd" into oc-dev am: 7b2cf1a085 by Marco Nelissen · 8 years ago
  20. 0a22c64 Merge "Merge changes from topic 'am-4850ee14901a4a6997e3cf7eeda9eab8' into nyc-dev am: f7397fa77b am: dcb1312f44 am: 9f16e8bd64 am: 9582cf69ee am: e25511c063" into oc-dev am: 5aba424710 by Wei Jia · 8 years ago
  21. 27c5a4f Merge changes from topic 'am-4850ee14901a4a6997e3cf7eeda9eab8' into nyc-dev am: f7397fa77b am: dcb1312f44 am: 9f16e8bd64 am: 9582cf69ee am: e25511c063 am: 283ea8ff27 by Wei Jia · 8 years ago
  22. 4a8e849 Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r20" into marshmallow-cts-dev am: 34c68a07e2 -s ours am: 09e0424548 am: 0b3b5dccc6 am: 4b90a0a01e am: ff39a57d19 -s ours am: 0b1bbe3edc am: 975a7c4275 am: 00b57deea7 am: c2e0b37663 am: f6cb521189 -s ours am: 0f230de217" into oc-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  23. 0ab7ff2 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r20" into marshmallow-cts-dev am: 34c68a07e2 -s ours am: 09e0424548 am: 0b3b5dccc6 am: 4b90a0a01e am: ff39a57d19 -s ours am: 0b1bbe3edc am: 975a7c4275 am: 00b57deea7 am: c2e0b37663 am: f6cb521189 -s ours by tinazh · 8 years ago
  24. 9e8605a Merge "resolve merge conflicts of 6dabee4a94 to mnc-dev am: a03e8e4a34 am: 028e4e71b9 am: fdb36433cd am: a8b2cc5c00 -s ours am: d7cd8d3aee am: 5452012ee1 am: e957010b50 am: df7705b93f am: f4f58eb536 am: 522a5c1ce5" into oc-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  25. dbcdfb2 Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r21" into lollipop-mr1-cts-dev am: 3cf482f1aa -s ours" into marshmallow-cts-dev am: 2fe51274db -s ours am: 034b4fe6b3 am: c905e844e1 am: 6ffd506feb am: e14e19968b -s ours am: 86932477bb am: 2056de0f29 am: 065e20ae8c am: c4a2d29821 am: 9ee582f644 -s ours by tinazh · 8 years ago
  26. f5d76cf resolve merge conflicts of 6dabee4a94 to mnc-dev am: a03e8e4a34 am: 028e4e71b9 am: fdb36433cd am: a8b2cc5c00 -s ours am: d7cd8d3aee am: 5452012ee1 am: e957010b50 am: df7705b93f am: f4f58eb536 by Wei Jia · 8 years ago
  27. 14a1751 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r20" into marshmallow-cts-dev am: 34c68a07e2 -s ours am: 09e0424548 am: 0b3b5dccc6 am: 4b90a0a01e am: ff39a57d19 -s ours am: 0b1bbe3edc am: 975a7c4275 am: 00b57deea7 am: c2e0b37663 am: f6cb521189 -s ours by tinazh · 8 years ago
  28. 8fe6058 resolve merge conflicts of 6dabee4a94 to mnc-dev am: a03e8e4a34 am: 028e4e71b9 am: fdb36433cd am: a8b2cc5c00 -s ours am: d7cd8d3aee am: 5452012ee1 am: e957010b50 am: df7705b93f am: f4f58eb536 by Wei Jia · 8 years ago
  29. 0fbe29a resolve merge conflicts of 6dabee4a94 to mnc-dev am: a03e8e4a34 am: 028e4e71b9 am: fdb36433cd am: a8b2cc5c00 -s ours am: d7cd8d3aee am: 5452012ee1 am: e957010b50 am: df7705b93f am: f4f58eb536 by Wei Jia · 8 years ago
  30. 97b605f Merge "Merge changes from topic 'cp' into marshmallow-cts-dev am: 87c36ca3d1 -s ours am: 69e7430907 am: 646da50e62 am: 0e6a03eaba am: 8c4b357952 -s ours am: bb5072ba82 am: 3cded17ed3 am: ed846bbda7 am: c0439b2c9f am: 7bd593acdd" into oc-dev by Marco Nelissen · 8 years ago
  31. 0045aa2 Merge "Merge changes from topic 'cp' into marshmallow-cts-dev am: 87c36ca3d1 -s ours am: 69e7430907 am: 646da50e62 am: 0e6a03eaba am: 8c4b357952 -s ours am: bb5072ba82 am: 3cded17ed3 am: ed846bbda7 am: c0439b2c9f am: 7bd593acdd" into oc-dev by Marco Nelissen · 8 years ago
  32. dabc077 Merge "Merge changes from topic 'am-4850ee14901a4a6997e3cf7eeda9eab8' into nyc-dev am: f7397fa77b am: dcb1312f44 am: 9f16e8bd64 am: 9582cf69ee am: e25511c063" into oc-dev by Wei Jia · 8 years ago
  33. e5a6c51 Merge "Merge changes from topic 'am-4850ee14901a4a6997e3cf7eeda9eab8' into nyc-dev am: f7397fa77b am: dcb1312f44 am: 9f16e8bd64 am: 9582cf69ee am: e25511c063" into oc-dev by Wei Jia · 8 years ago
  34. 7fb0447 Merge "Merge "Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r21" into lollipop-mr1-cts-dev am: 3cf482f1aa -s ours" into marshmallow-cts-dev am: 2fe51274db -s ours" into nougat-cts-dev am: a6d0d0df20 -s ours" into nyc-dev am: d037411fb7 am: fd9f3b450c am: 2c0062c254 am: 8187f2f84f am: dc08cbf649 -s ours am: aa4dff61c2 am: d9759753b9" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  35. eceb0b8 Merge changes from topic 'am-4850ee14901a4a6997e3cf7eeda9eab8' into nyc-dev am: f7397fa77b am: dcb1312f44 am: 9f16e8bd64 am: 9582cf69ee am: e25511c063 by Wei Jia · 8 years ago
  36. c381cb0 Merge "Merge "Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r21" into lollipop-mr1-cts-dev am: 3cf482f1aa -s ours" into marshmallow-cts-dev am: 2fe51274db -s ours" into nougat-cts-dev am: a6d0d0df20 -s ours" into nyc-dev am: d037411fb7 am: fd9f3b450c am: 2c0062c254 am: 8187f2f84f am: dc08cbf649 -s ours am: aa4dff61c2 am: 0a40dadcf8" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  37. 1897b6e Merge changes from topic 'am-4850ee14901a4a6997e3cf7eeda9eab8' into nyc-dev am: f7397fa77b am: dcb1312f44 am: 9f16e8bd64 am: 9582cf69ee am: e25511c063 by Wei Jia · 8 years ago
  38. 8a22b63 Merge "Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r21" into lollipop-mr1-cts-dev am: 3cf482f1aa -s ours" into marshmallow-cts-dev am: 2fe51274db -s ours" into nougat-cts-dev am: a6d0d0df20 -s ours" into nyc-dev am: d037411fb7 am: fd9f3b450c am: 2c0062c254 am: 8187f2f84f am: dc08cbf649 -s ours am: aa4dff61c2 by tinazh · 8 years ago
  39. 57ad99b Merge "Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r21" into lollipop-mr1-cts-dev am: 3cf482f1aa -s ours" into marshmallow-cts-dev am: 2fe51274db -s ours" into nougat-cts-dev am: a6d0d0df20 -s ours" into nyc-dev am: d037411fb7 am: fd9f3b450c am: 2c0062c254 am: 8187f2f84f am: dc08cbf649 -s ours am: aa4dff61c2 by tinazh · 8 years ago
  40. fec4b51 Merge "Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r20" into marshmallow-cts-dev am: 34c68a07e2 -s ours" into nougat-cts-dev am: d0f7bdcf22 -s ours" into nyc-dev am: 1332090a3e am: 0f5ce2ec80 am: b50ec0cca1 am: 635843d877 am: 2d84e3a925 -s ours am: 38bb301095 am: 1d695cf6d9" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  41. 7ace5c4 Merge "Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r20" into marshmallow-cts-dev am: 34c68a07e2 -s ours" into nougat-cts-dev am: d0f7bdcf22 -s ours" into nyc-dev am: 1332090a3e am: 0f5ce2ec80 am: b50ec0cca1 am: 635843d877 am: 2d84e3a925 -s ours am: 38bb301095 am: 58563a00f4" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  42. 88874c6 Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r20" into marshmallow-cts-dev am: 34c68a07e2 -s ours" into nougat-cts-dev am: d0f7bdcf22 -s ours" into nyc-dev am: 1332090a3e am: 0f5ce2ec80 am: b50ec0cca1 am: 635843d877 am: 2d84e3a925 -s ours am: 38bb301095 by tinazh · 8 years ago
  43. fed3573 Merge "Merge changes from topic 'am-6787bd5fc8ed41dab02342626b22c7a3' into nyc-dev am: 299a957c59 am: bae70ba566 am: 88b562a385 am: 97c7e371e0 am: d51046c293 am: 10b0533ba4 am: b0d7e984f2" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  44. 704c823 Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r20" into marshmallow-cts-dev am: 34c68a07e2 -s ours" into nougat-cts-dev am: d0f7bdcf22 -s ours" into nyc-dev am: 1332090a3e am: 0f5ce2ec80 am: b50ec0cca1 am: 635843d877 am: 2d84e3a925 -s ours am: 38bb301095 by tinazh · 8 years ago
  45. 851299d Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r21" into lollipop-mr1-cts-dev am: 3cf482f1aa -s ours" into marshmallow-cts-dev am: 2fe51274db -s ours am: 034b4fe6b3 am: c905e844e1 am: 6ffd506feb am: e14e19968b -s ours am: 86932477bb am: 2056de0f29 am: 065e20ae8c am: c4a2d29821 by tinazh · 8 years ago
  46. 2fd7923 Merge changes from topic 'am-6787bd5fc8ed41dab02342626b22c7a3' into nyc-dev am: 299a957c59 am: bae70ba566 am: 88b562a385 am: 97c7e371e0 am: d51046c293 am: 10b0533ba4 by Marco Nelissen · 8 years ago
  47. 821c9d3 Merge changes from topic 'am-6787bd5fc8ed41dab02342626b22c7a3' into nyc-dev am: 299a957c59 am: bae70ba566 am: 88b562a385 am: 97c7e371e0 am: d51046c293 am: 10b0533ba4 by Marco Nelissen · 8 years ago
  48. 0f230de Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r20" into marshmallow-cts-dev am: 34c68a07e2 -s ours am: 09e0424548 am: 0b3b5dccc6 am: 4b90a0a01e am: ff39a57d19 -s ours am: 0b1bbe3edc am: 975a7c4275 am: 00b57deea7 am: c2e0b37663 by tinazh · 8 years ago
  49. 522a5c1 resolve merge conflicts of 6dabee4a94 to mnc-dev am: a03e8e4a34 am: 028e4e71b9 am: fdb36433cd am: a8b2cc5c00 -s ours am: d7cd8d3aee am: 5452012ee1 am: e957010b50 am: df7705b93f by Wei Jia · 8 years ago
  50. d975975 Merge "Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r21" into lollipop-mr1-cts-dev am: 3cf482f1aa -s ours" into marshmallow-cts-dev am: 2fe51274db -s ours" into nougat-cts-dev am: a6d0d0df20 -s ours" into nyc-dev am: d037411fb7 am: fd9f3b450c am: 2c0062c254 am: 8187f2f84f am: dc08cbf649 -s ours by tinazh · 8 years ago
  51. 0a40dad Merge "Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r21" into lollipop-mr1-cts-dev am: 3cf482f1aa -s ours" into marshmallow-cts-dev am: 2fe51274db -s ours" into nougat-cts-dev am: a6d0d0df20 -s ours" into nyc-dev am: d037411fb7 am: fd9f3b450c am: 2c0062c254 am: 8187f2f84f am: dc08cbf649 -s ours by tinazh · 8 years ago
  52. 58563a0 Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r20" into marshmallow-cts-dev am: 34c68a07e2 -s ours" into nougat-cts-dev am: d0f7bdcf22 -s ours" into nyc-dev am: 1332090a3e am: 0f5ce2ec80 am: b50ec0cca1 am: 635843d877 am: 2d84e3a925 -s ours by tinazh · 8 years ago
  53. 1d695cf Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r20" into marshmallow-cts-dev am: 34c68a07e2 -s ours" into nougat-cts-dev am: d0f7bdcf22 -s ours" into nyc-dev am: 1332090a3e am: 0f5ce2ec80 am: b50ec0cca1 am: 635843d877 am: 2d84e3a925 -s ours by tinazh · 8 years ago
  54. 7b2cf1a Merge "Merge changes from topic 'cp' into marshmallow-cts-dev am: 87c36ca3d1 -s ours am: 69e7430907 am: 646da50e62 am: 0e6a03eaba am: 8c4b357952 -s ours am: bb5072ba82 am: 3cded17ed3 am: ed846bbda7 am: c0439b2c9f am: 7bd593acdd" into oc-dev by Android Build Merger (Role) · 8 years ago
  55. 1933bb1 Merge changes from topic 'am-6787bd5fc8ed41dab02342626b22c7a3' into nyc-dev am: 299a957c59 am: bae70ba566 am: 88b562a385 am: 97c7e371e0 am: d51046c293 by Marco Nelissen · 8 years ago
  56. 8bef5e6 Merge changes from topic 'cp' into marshmallow-cts-dev am: 87c36ca3d1 -s ours am: 69e7430907 am: 646da50e62 am: 0e6a03eaba am: 8c4b357952 -s ours am: bb5072ba82 am: 3cded17ed3 am: ed846bbda7 am: c0439b2c9f by Marco Nelissen · 8 years ago
  57. 5aba424 Merge "Merge changes from topic 'am-4850ee14901a4a6997e3cf7eeda9eab8' into nyc-dev am: f7397fa77b am: dcb1312f44 am: 9f16e8bd64 am: 9582cf69ee am: e25511c063" into oc-dev by Android Build Merger (Role) · 8 years ago
  58. b0d7e98 Merge changes from topic 'am-6787bd5fc8ed41dab02342626b22c7a3' into nyc-dev am: 299a957c59 am: bae70ba566 am: 88b562a385 am: 97c7e371e0 am: d51046c293 by Marco Nelissen · 8 years ago
  59. ece2998 Merge "Merge "Use frame stride and slice height" into marshmallow-cts-dev am: c3f83dfab9 am: e7ed7d8332 am: bbf2c8beb3 am: 0cff2a7f39 am: 3aac3fedcf am: 49cd49cdda am: 435299c0f9 am: 0a2096f0ef am: ee789b0387 am: 9d8876b7d0 am: 156093379d am: 7a46ed1e58" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  60. 4517313 Merge "Merge "Use frame stride and slice height" into marshmallow-cts-dev am: c3f83dfab9 am: e7ed7d8332 am: bbf2c8beb3 am: 0cff2a7f39 am: 3aac3fedcf am: 49cd49cdda am: 435299c0f9 am: 0a2096f0ef am: ee789b0387 am: 9d8876b7d0 am: 156093379d am: 3dc57dbef6" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  61. b4654af Merge "Use frame stride and slice height" into marshmallow-cts-dev am: c3f83dfab9 am: e7ed7d8332 am: bbf2c8beb3 am: 0cff2a7f39 am: 3aac3fedcf am: 49cd49cdda am: 435299c0f9 am: 0a2096f0ef am: ee789b0387 am: 9d8876b7d0 am: 156093379d by Jay Tu · 8 years ago
  62. 250d6ae Merge "Merge "Merge "Use frame stride and slice height" into marshmallow-cts-dev am: c3f83dfab9 -s ours" into nougat-cts-dev am: 9fe7f1c1f8 am: 1a7bbf63f5 am: f925caccf8 am: d9bd286886 am: 444975136c am: 3bb9f11dbc am: 12e45d5fd5 am: 658597c706" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  63. 9c049c2 Merge "Use frame stride and slice height" into marshmallow-cts-dev am: c3f83dfab9 am: e7ed7d8332 am: bbf2c8beb3 am: 0cff2a7f39 am: 3aac3fedcf am: 49cd49cdda am: 435299c0f9 am: 0a2096f0ef am: ee789b0387 am: 9d8876b7d0 am: 156093379d by Jay Tu · 8 years ago
  64. ea6514f Merge "Merge "Merge "Use frame stride and slice height" into marshmallow-cts-dev am: c3f83dfab9 -s ours" into nougat-cts-dev am: 9fe7f1c1f8 am: 1a7bbf63f5 am: f925caccf8 am: d9bd286886 am: 444975136c am: 3bb9f11dbc am: 12e45d5fd5 am: 153c151615" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  65. d999569 Merge "Merge "Use frame stride and slice height" into marshmallow-cts-dev am: c3f83dfab9 -s ours" into nougat-cts-dev am: 9fe7f1c1f8 am: 1a7bbf63f5 am: f925caccf8 am: d9bd286886 am: 444975136c am: 3bb9f11dbc am: 12e45d5fd5 by Jay Tu · 8 years ago
  66. 36f96fc Merge "Merge "DO NOT MERGE add annotations to for months 2016-11 --> 2017-07, also adding all of the stagefright tests" into nyc-dev am: 7567271c88 am: ad564d483c -s ours am: 2ddf1af593 am: 32db4da68e am: 3f3d0d1209 -s ours am: fcd443d256 am: da52af794a" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  67. 1f72c08 Merge "Merge "Use frame stride and slice height" into marshmallow-cts-dev am: c3f83dfab9 -s ours" into nougat-cts-dev am: 9fe7f1c1f8 am: 1a7bbf63f5 am: f925caccf8 am: d9bd286886 am: 444975136c am: 3bb9f11dbc am: 12e45d5fd5 by Jay Tu · 8 years ago
  68. e464dbe Merge changes from topic 'am-4850ee14901a4a6997e3cf7eeda9eab8' into nyc-dev am: f7397fa77b am: dcb1312f44 am: 9f16e8bd64 am: 9582cf69ee by Wei Jia · 8 years ago
  69. 280555a Merge "DO NOT MERGE add annotations to for months 2016-11 --> 2017-07, also adding all of the stagefright tests" into nyc-dev am: 7567271c88 am: ad564d483c -s ours am: 2ddf1af593 am: 32db4da68e am: 3f3d0d1209 -s ours am: fcd443d256 by Badash · 8 years ago
  70. efdc511 Merge "DO NOT MERGE add annotations to for months 2016-11 --> 2017-07, also adding all of the stagefright tests" into nyc-dev am: 7567271c88 am: ad564d483c -s ours am: 2ddf1af593 am: 32db4da68e am: 3f3d0d1209 -s ours am: fcd443d256 by Badash · 8 years ago
  71. 9ee582f Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r21" into lollipop-mr1-cts-dev am: 3cf482f1aa -s ours" into marshmallow-cts-dev am: 2fe51274db -s ours am: 034b4fe6b3 am: c905e844e1 am: 6ffd506feb am: e14e19968b -s ours am: 86932477bb am: 2056de0f29 am: 065e20ae8c by tinazh · 8 years ago
  72. 283ea8f Merge changes from topic 'am-4850ee14901a4a6997e3cf7eeda9eab8' into nyc-dev am: f7397fa77b am: dcb1312f44 am: 9f16e8bd64 am: 9582cf69ee by Wei Jia · 8 years ago
  73. f6cb521 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r20" into marshmallow-cts-dev am: 34c68a07e2 -s ours am: 09e0424548 am: 0b3b5dccc6 am: 4b90a0a01e am: ff39a57d19 -s ours am: 0b1bbe3edc am: 975a7c4275 am: 00b57deea7 by tinazh · 8 years ago
  74. 7a46ed1 Merge "Use frame stride and slice height" into marshmallow-cts-dev am: c3f83dfab9 am: e7ed7d8332 am: bbf2c8beb3 am: 0cff2a7f39 am: 3aac3fedcf am: 49cd49cdda am: 435299c0f9 am: 0a2096f0ef am: ee789b0387 am: 9d8876b7d0 by Jay Tu · 8 years ago
  75. aa4dff6 Merge "Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r21" into lollipop-mr1-cts-dev am: 3cf482f1aa -s ours" into marshmallow-cts-dev am: 2fe51274db -s ours" into nougat-cts-dev am: a6d0d0df20 -s ours" into nyc-dev am: d037411fb7 am: fd9f3b450c am: 2c0062c254 am: 8187f2f84f by tinazh · 8 years ago
  76. 3dc57db Merge "Use frame stride and slice height" into marshmallow-cts-dev am: c3f83dfab9 am: e7ed7d8332 am: bbf2c8beb3 am: 0cff2a7f39 am: 3aac3fedcf am: 49cd49cdda am: 435299c0f9 am: 0a2096f0ef am: ee789b0387 am: 9d8876b7d0 by Jay Tu · 8 years ago
  77. f4f58eb resolve merge conflicts of 6dabee4a94 to mnc-dev am: a03e8e4a34 am: 028e4e71b9 am: fdb36433cd am: a8b2cc5c00 -s ours am: d7cd8d3aee am: 5452012ee1 am: e957010b50 by Wei Jia · 8 years ago
  78. 38bb301 Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r20" into marshmallow-cts-dev am: 34c68a07e2 -s ours" into nougat-cts-dev am: d0f7bdcf22 -s ours" into nyc-dev am: 1332090a3e am: 0f5ce2ec80 am: b50ec0cca1 am: 635843d877 by tinazh · 8 years ago
  79. 658597c Merge "Merge "Use frame stride and slice height" into marshmallow-cts-dev am: c3f83dfab9 -s ours" into nougat-cts-dev am: 9fe7f1c1f8 am: 1a7bbf63f5 am: f925caccf8 am: d9bd286886 am: 444975136c am: 3bb9f11dbc by Jay Tu · 8 years ago
  80. 153c151 Merge "Merge "Use frame stride and slice height" into marshmallow-cts-dev am: c3f83dfab9 -s ours" into nougat-cts-dev am: 9fe7f1c1f8 am: 1a7bbf63f5 am: f925caccf8 am: d9bd286886 am: 444975136c am: 3bb9f11dbc by Jay Tu · 8 years ago
  81. 10b0533 Merge changes from topic 'am-6787bd5fc8ed41dab02342626b22c7a3' into nyc-dev am: 299a957c59 am: bae70ba566 am: 88b562a385 am: 97c7e371e0 by Marco Nelissen · 8 years ago
  82. da52af7 Merge "DO NOT MERGE add annotations to for months 2016-11 --> 2017-07, also adding all of the stagefright tests" into nyc-dev am: 7567271c88 am: ad564d483c -s ours am: 2ddf1af593 am: 32db4da68e am: 3f3d0d1209 -s ours by Badash · 8 years ago
  83. a8441d7 Merge "DO NOT MERGE add annotations to for months 2016-11 --> 2017-07, also adding all of the stagefright tests" into nyc-dev am: 7567271c88 am: ad564d483c -s ours am: 2ddf1af593 am: 32db4da68e am: 3f3d0d1209 -s ours by Badash · 8 years ago
  84. 7bd593a Merge changes from topic 'cp' into marshmallow-cts-dev am: 87c36ca3d1 -s ours am: 69e7430907 am: 646da50e62 am: 0e6a03eaba am: 8c4b357952 -s ours am: bb5072ba82 am: 3cded17ed3 am: ed846bbda7 by Marco Nelissen · 8 years ago
  85. e25511c Merge changes from topic 'am-4850ee14901a4a6997e3cf7eeda9eab8' into nyc-dev am: f7397fa77b am: dcb1312f44 am: 9f16e8bd64 by Wei Jia · 8 years ago
  86. 1560933 Merge "Use frame stride and slice height" into marshmallow-cts-dev am: c3f83dfab9 am: e7ed7d8332 am: bbf2c8beb3 am: 0cff2a7f39 am: 3aac3fedcf am: 49cd49cdda am: 435299c0f9 am: 0a2096f0ef am: ee789b0387 by Jay Tu · 8 years ago
  87. dc08cbf Merge "Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r21" into lollipop-mr1-cts-dev am: 3cf482f1aa -s ours" into marshmallow-cts-dev am: 2fe51274db -s ours" into nougat-cts-dev am: a6d0d0df20 -s ours" into nyc-dev am: d037411fb7 am: fd9f3b450c am: 2c0062c254 by tinazh · 8 years ago
  88. c4a2d29 Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r21" into lollipop-mr1-cts-dev am: 3cf482f1aa -s ours" into marshmallow-cts-dev am: 2fe51274db -s ours am: 034b4fe6b3 am: c905e844e1 am: 6ffd506feb am: e14e19968b -s ours am: 86932477bb am: 2056de0f29 by tinazh · 8 years ago
  89. 12e45d5 Merge "Merge "Use frame stride and slice height" into marshmallow-cts-dev am: c3f83dfab9 -s ours" into nougat-cts-dev am: 9fe7f1c1f8 am: 1a7bbf63f5 am: f925caccf8 am: d9bd286886 am: 444975136c by Jay Tu · 8 years ago
  90. 2d84e3a Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r20" into marshmallow-cts-dev am: 34c68a07e2 -s ours" into nougat-cts-dev am: d0f7bdcf22 -s ours" into nyc-dev am: 1332090a3e am: 0f5ce2ec80 am: b50ec0cca1 by tinazh · 8 years ago
  91. c2e0b37 Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r20" into marshmallow-cts-dev am: 34c68a07e2 -s ours am: 09e0424548 am: 0b3b5dccc6 am: 4b90a0a01e am: ff39a57d19 -s ours am: 0b1bbe3edc am: 975a7c4275 by tinazh · 8 years ago
  92. fcd443d Merge "DO NOT MERGE add annotations to for months 2016-11 --> 2017-07, also adding all of the stagefright tests" into nyc-dev am: 7567271c88 am: ad564d483c -s ours am: 2ddf1af593 am: 32db4da68e by Badash · 8 years ago
  93. df7705b resolve merge conflicts of 6dabee4a94 to mnc-dev am: a03e8e4a34 am: 028e4e71b9 am: fdb36433cd am: a8b2cc5c00 -s ours am: d7cd8d3aee am: 5452012ee1 by Wei Jia · 8 years ago
  94. d51046c Merge changes from topic 'am-6787bd5fc8ed41dab02342626b22c7a3' into nyc-dev am: 299a957c59 am: bae70ba566 am: 88b562a385 by Marco Nelissen · 8 years ago
  95. c0439b2 Merge changes from topic 'cp' into marshmallow-cts-dev am: 87c36ca3d1 -s ours am: 69e7430907 am: 646da50e62 am: 0e6a03eaba am: 8c4b357952 -s ours am: bb5072ba82 am: 3cded17ed3 by Marco Nelissen · 8 years ago
  96. 9d8876b Merge "Use frame stride and slice height" into marshmallow-cts-dev am: c3f83dfab9 am: e7ed7d8332 am: bbf2c8beb3 am: 0cff2a7f39 am: 3aac3fedcf am: 49cd49cdda am: 435299c0f9 am: 0a2096f0ef by Jay Tu · 8 years ago
  97. 9582cf6 Merge changes from topic 'am-4850ee14901a4a6997e3cf7eeda9eab8' into nyc-dev am: f7397fa77b am: dcb1312f44 by Wei Jia · 8 years ago
  98. 3bb9f11 Merge "Merge "Use frame stride and slice height" into marshmallow-cts-dev am: c3f83dfab9 -s ours" into nougat-cts-dev am: 9fe7f1c1f8 am: 1a7bbf63f5 am: f925caccf8 am: d9bd286886 by Jay Tu · 8 years ago
  99. 8187f2f Merge "Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r21" into lollipop-mr1-cts-dev am: 3cf482f1aa -s ours" into marshmallow-cts-dev am: 2fe51274db -s ours" into nougat-cts-dev am: a6d0d0df20 -s ours" into nyc-dev am: d037411fb7 am: fd9f3b450c by tinazh · 8 years ago
  100. 3f3d0d1 Merge "DO NOT MERGE add annotations to for months 2016-11 --> 2017-07, also adding all of the stagefright tests" into nyc-dev am: 7567271c88 am: ad564d483c -s ours am: 2ddf1af593 by Badash · 8 years ago