Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / e6a53d52eded2b43a53f9950e4b520aa1a1a7f04
  1. e6a53d5 Merge "Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94 am: 5ba953cbe9" into oc-dev-plus-aosp am: c8505e49c5 -s ours" into oc-dr1-dev-plus-aosp by Erik Kline · 8 years ago
  2. 95c9d09 Merge "Merge "Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94" into stage-aosp-master am: 6340d93571" into oc-dev-plus-aosp am: 41d52b1bb2 -s ours" into oc-dr1-dev-plus-aosp by Erik Kline · 8 years ago
  3. dce0bb9 Merge "Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94 am: 5ba953cbe9" into oc-dev-plus-aosp am: c8505e49c5 -s ours" into oc-dr1-dev-plus-aosp by Erik Kline · 8 years ago
  4. c595994 Merge "Merge "Update the smearing methods in framework." into oc-dr1-dev am: 386d8133c4" into oc-dr1-dev-plus-aosp by jackqdyulei · 8 years ago
  5. d1b27bf Merge "Update the smearing methods in framework." into oc-dr1-dev am: 386d8133c4 by jackqdyulei · 8 years ago
  6. 8cb1927 Merge "Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94 am: 5ba953cbe9" into oc-dev-plus-aosp am: c8505e49c5 -s ours" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  7. ba48fd4 Merge "Merge "Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94" into stage-aosp-master am: 6340d93571" into oc-dev-plus-aosp am: 41d52b1bb2 -s ours" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  8. ab61c2d Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94 am: 5ba953cbe9" into oc-dev-plus-aosp by Erik Kline · 8 years ago
  9. f5d3eed Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94 am: 5ba953cbe9 am: 8c72e188f2 -s ours" into oc-dr1-dev-plus-aosp by Erik Kline · 8 years ago
  10. e1357fc Merge "Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94" into stage-aosp-master am: 6340d93571" into oc-dev-plus-aosp by Erik Kline · 8 years ago
  11. a9c8983 Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94 am: 5ba953cbe9 am: 8c72e188f2 -s ours by Erik Kline · 8 years ago
  12. 3626feb Merge "Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94 am: 5ba953cbe9" into oc-dev-plus-aosp am: c8505e49c5 -s ours" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  13. d2fe259 Merge "Merge "Update the smearing methods in framework." into oc-dr1-dev am: 386d8133c4" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  14. ddb8471 Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94 am: 5ba953cbe9" into oc-dev-plus-aosp by Erik Kline · 8 years ago
  15. 8f386f6 Merge "Update the smearing methods in framework." into oc-dr1-dev am: 386d8133c4 by jackqdyulei · 8 years ago
  16. 3a55bcc Merge "Update the smearing methods in framework." into oc-dr1-dev am: 386d8133c4 by jackqdyulei · 8 years ago
  17. 4cbb47f Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94 am: 5ba953cbe9 am: 8c72e188f2 -s ours" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  18. 076594e Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94 am: 5ba953cbe9 by Erik Kline · 8 years ago
  19. 499ef2c Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94 am: 5ba953cbe9 by Erik Kline · 8 years ago
  20. 41d52b1 Merge "Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94" into stage-aosp-master am: 6340d93571" into oc-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  21. 7b33532 Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94" into stage-aosp-master by Erik Kline · 8 years ago
  22. c8505e4 Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94 am: 5ba953cbe9" into oc-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  23. 8b79475 Merge "Allow timed wakelocks to be released gracefully." by TreeHugger Robot · 8 years ago
  24. 386d813 Merge "Update the smearing methods in framework." into oc-dr1-dev by TreeHugger Robot · 8 years ago
  25. e591294 Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94 by Erik Kline · 8 years ago
  26. 8c72e18 Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94 by Erik Kline · 8 years ago
  27. e97ff16 Merge "Log Bundle statistics when too large." by TreeHugger Robot · 8 years ago
  28. 6340d93 Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94" into stage-aosp-master by Android Build Merger (Role) · 8 years ago
  29. 7ba301e Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94 by Erik Kline · 8 years ago
  30. b3f6823 Merge "Stop tracking user specific uid cpu time on user stop" by TreeHugger Robot · 8 years ago
  31. 5ba953c Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94 by Erik Kline · 8 years ago
  32. 417f209 Merge "Added -g option" by TreeHugger Robot · 8 years ago
  33. 36904fbc Merge "Better logging infrastructure in OffloadHardwareInterface" by Treehugger Robot · 8 years ago
  34. f6eb3b2 Merge "Merge "Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev am: 484d742af0" into oc-dr1-dev-plus-aosp am: faf101f24c" by Android Build Merger (Role) · 8 years ago
  35. 372e26d1 Merge "Merge "Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev am: 484d742af0" into oc-dr1-dev-plus-aosp am: faf101f24c" by Android Build Merger (Role) · 8 years ago
  36. 1450110 Merge "Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev am: 484d742af0" into oc-dr1-dev-plus-aosp by Bryce Lee · 8 years ago
  37. 43dceb9 Merge "Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev am: 484d742af0 am: 6ca5e16be3" by Android Build Merger (Role) · 8 years ago
  38. 41fb106 Merge "Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev am: 484d742af0" into oc-dr1-dev-plus-aosp by Bryce Lee · 8 years ago
  39. 0b4b7c9 Merge "Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev am: 484d742af0 am: 6ca5e16be3" by Android Build Merger (Role) · 8 years ago
  40. 386389e Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev am: 484d742af0 by Bryce Lee · 8 years ago
  41. 6dd5c42 Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev am: 484d742af0 by Bryce Lee · 8 years ago
  42. b2d1d70 Merge "Merge "Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 4e4b5a2426" into oc-dev-plus-aosp am: 313d31af94" into oc-dr1-dev-plus-aosp am: 45ff9d8c29" by Android Build Merger (Role) · 8 years ago
  43. 9ab3dbc6 Merge "Merge "Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 4e4b5a2426" into oc-dev-plus-aosp am: 313d31af94" into oc-dr1-dev-plus-aosp am: 45ff9d8c29" by Android Build Merger (Role) · 8 years ago
  44. a3a4ef8 Merge "Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 4e4b5a2426" into oc-dev-plus-aosp am: 313d31af94" into oc-dr1-dev-plus-aosp by Tobias Thierer · 8 years ago
  45. 4e8dc48 Merge "Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 4e4b5a2426" into oc-dev-plus-aosp am: 313d31af94" into oc-dr1-dev-plus-aosp by Tobias Thierer · 8 years ago
  46. a2b5dbc Merge "Merge "Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 4e4b5a2426" into oc-dev-plus-aosp am: 81d0134a0f" into oc-dr1-dev-plus-aosp am: bbaeb7a782" by Android Build Merger (Role) · 8 years ago
  47. c663c82 Merge "Merge "Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 4e4b5a2426" into oc-dev-plus-aosp am: 81d0134a0f" into oc-dr1-dev-plus-aosp am: bbaeb7a782" by Android Build Merger (Role) · 8 years ago
  48. 84a28b3 Merge "Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 4e4b5a2426" into oc-dev-plus-aosp am: 81d0134a0f" into oc-dr1-dev-plus-aosp by Tobias Thierer · 8 years ago
  49. 9032132 Merge "Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 4e4b5a2426" into oc-dev-plus-aosp am: 81d0134a0f" into oc-dr1-dev-plus-aosp by Tobias Thierer · 8 years ago
  50. 895c811 Merge "Merge "Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 4e4b5a2426" into oc-dev-plus-aosp am: 81d0134a0f" into oc-dr1-dev-plus-aosp am: e6d396df1f" by Android Build Merger (Role) · 8 years ago
  51. 776a6b6 Merge "Merge "Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 4e4b5a2426" into oc-dev-plus-aosp am: 81d0134a0f" into oc-dr1-dev-plus-aosp am: e6d396df1f" by Android Build Merger (Role) · 8 years ago
  52. 10d2034 Merge "Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 4e4b5a2426" into oc-dev-plus-aosp am: 81d0134a0f" into oc-dr1-dev-plus-aosp by Tobias Thierer · 8 years ago
  53. 8be13a6 Merge "Merge "Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 93cc3d86ad" into oc-dev-plus-aosp am: 6a9d07ed22" into oc-dr1-dev-plus-aosp am: d08fe5a6f9" by Android Build Merger (Role) · 8 years ago
  54. 7a512db Merge "Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 4e4b5a2426" into oc-dev-plus-aosp am: 81d0134a0f" into oc-dr1-dev-plus-aosp by Tobias Thierer · 8 years ago
  55. 8873e2a Merge "Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 93cc3d86ad" into oc-dev-plus-aosp am: 6a9d07ed22" into oc-dr1-dev-plus-aosp by Tobias Thierer · 8 years ago
  56. a2b0de2 Merge "Merge "Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 93cc3d86ad" into oc-dev-plus-aosp am: 6a9d07ed22" into oc-dr1-dev-plus-aosp am: d08fe5a6f9" by Android Build Merger (Role) · 8 years ago
  57. da71261 Merge "Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 93cc3d86ad" into oc-dev-plus-aosp am: 6a9d07ed22" into oc-dr1-dev-plus-aosp by Tobias Thierer · 8 years ago
  58. 8adc39b Merge "Merge "Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 93cc3d86ad" into oc-dev-plus-aosp am: 6a9d07ed22" into oc-dr1-dev-plus-aosp am: 4a10a10448" by Android Build Merger (Role) · 8 years ago
  59. d3e504e6 Merge "Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 93cc3d86ad" into oc-dev-plus-aosp am: 6a9d07ed22" into oc-dr1-dev-plus-aosp by Tobias Thierer · 8 years ago
  60. 743f5db Merge "Merge "Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 93cc3d86ad" into oc-dev-plus-aosp am: d01571b951" into oc-dr1-dev-plus-aosp am: 848b0f2a8d" by Android Build Merger (Role) · 8 years ago
  61. 15fcebe Merge "Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 93cc3d86ad" into oc-dev-plus-aosp am: d01571b951" into oc-dr1-dev-plus-aosp by Tobias Thierer · 8 years ago
  62. 68d8294 Merge "Merge "Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 93cc3d86ad" into oc-dev-plus-aosp am: d01571b951" into oc-dr1-dev-plus-aosp am: d44c1a7d13" by Android Build Merger (Role) · 8 years ago
  63. 60b108d Merge "Fix RTL issue in RelativeLayout" by TreeHugger Robot · 8 years ago
  64. 8f367b2 Merge "Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 93cc3d86ad" into oc-dev-plus-aosp am: d01571b951" into oc-dr1-dev-plus-aosp by Tobias Thierer · 8 years ago
  65. c952978 Merge "Merge "Merge "Merge "Merge "Framework: Add libziparchive dependency" am: 2688a9ab56" into stage-aosp-master am: 42d194ee03" into oc-dev-plus-aosp am: 8bbf3cad1e" into oc-dr1-dev-plus-aosp am: 968333fb8f" by Android Build Merger (Role) · 8 years ago
  66. 02730be Merge "Merge "Merge "Merge "Framework: Add libziparchive dependency" am: 2688a9ab56" into stage-aosp-master am: 42d194ee03" into oc-dev-plus-aosp am: 8bbf3cad1e" into oc-dr1-dev-plus-aosp by Andreas Gampe · 8 years ago
  67. c88b038 Merge "Merge "Merge "Merge "Merge "Framework: Add libziparchive dependency" am: 2688a9ab56" into stage-aosp-master am: 42d194ee03" into oc-dev-plus-aosp am: 8bbf3cad1e" into oc-dr1-dev-plus-aosp am: bc4d25986e" by Android Build Merger (Role) · 8 years ago
  68. db75add Merge "Merge "Merge "Merge "Merge "Framework: Add libziparchive dependency" am: 2688a9ab56" into stage-aosp-master am: 42d194ee03" into oc-dev-plus-aosp am: 8bbf3cad1e" into oc-dr1-dev-plus-aosp am: bc4d25986e" by Android Build Merger (Role) · 8 years ago
  69. a6ba598 Merge "Merge "Merge "Merge "Framework: Add libziparchive dependency" am: 2688a9ab56" into stage-aosp-master am: 42d194ee03" into oc-dev-plus-aosp am: 8bbf3cad1e" into oc-dr1-dev-plus-aosp by Andreas Gampe · 8 years ago
  70. c08c2c4 Merge "Merge "Merge "Merge "Framework: Add libziparchive dependency" am: 2688a9ab56" into stage-aosp-master am: 42d194ee03" into oc-dev-plus-aosp am: 8bbf3cad1e" into oc-dr1-dev-plus-aosp by Andreas Gampe · 8 years ago
  71. faf101f Merge "Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev am: 484d742af0" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  72. 2ebd318 Merge "Merge "Merge "Merge "Framework: Add libziparchive dependency" am: 2688a9ab56" into stage-aosp-master am: 42d194ee03 am: a94db9f04d" into oc-dr1-dev-plus-aosp am: be2860699b" by Android Build Merger (Role) · 8 years ago
  73. f011de0 Merge "Merge "Merge "Merge "Framework: Add libziparchive dependency" am: 2688a9ab56" into stage-aosp-master am: 42d194ee03 am: a94db9f04d" into oc-dr1-dev-plus-aosp am: be2860699b" by Android Build Merger (Role) · 8 years ago
  74. d99d82c Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev by Bryce Lee · 8 years ago
  75. dd6e5b5 Merge "Merge "Merge "Framework: Add libziparchive dependency" am: 2688a9ab56" into stage-aosp-master am: 42d194ee03 am: a94db9f04d" into oc-dr1-dev-plus-aosp by Andreas Gampe · 8 years ago
  76. 6ca5e16 Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev by Bryce Lee · 8 years ago
  77. e32edc4 Merge "Merge "Merge "Framework: Add libziparchive dependency" am: 2688a9ab56" into stage-aosp-master am: 42d194ee03 am: a94db9f04d" into oc-dr1-dev-plus-aosp by Andreas Gampe · 8 years ago
  78. 86712e0 Merge "Merge "Merge "Framework: Add libziparchive dependency" am: 2688a9ab56" into stage-aosp-master am: 42d194ee03 am: a94db9f04d am: 3afbfa708a" by Android Build Merger (Role) · 8 years ago
  79. 064446e Merge "Merge "Merge "Framework: Add libziparchive dependency" am: 2688a9ab56" into stage-aosp-master am: 42d194ee03 am: a94db9f04d am: 3afbfa708a" by Android Build Merger (Role) · 8 years ago
  80. fff9a33 Merge "Merge "Framework: Add libziparchive dependency" am: 2688a9ab56" into stage-aosp-master am: 42d194ee03 am: a94db9f04d by Andreas Gampe · 8 years ago
  81. 78c2945 Merge "Merge "Framework: Add libziparchive dependency" am: 2688a9ab56" into stage-aosp-master am: 42d194ee03 am: a94db9f04d by Andreas Gampe · 8 years ago
  82. 45ff9d8 Merge "Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 4e4b5a2426" into oc-dev-plus-aosp am: 313d31af94" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  83. aa46129 Merge "Merge "Merge "Merge "Framework: Add libziparchive dependency" am: 2688a9ab56 am: f70270f94a" into oc-dev-plus-aosp am: 3255899bbd" into oc-dr1-dev-plus-aosp am: 2cc4474260" by Android Build Merger (Role) · 8 years ago
  84. 4a3608d Merge "Merge "Merge "Merge "Framework: Add libziparchive dependency" am: 2688a9ab56 am: f70270f94a" into oc-dev-plus-aosp am: 3255899bbd" into oc-dr1-dev-plus-aosp am: 2cc4474260" by Android Build Merger (Role) · 8 years ago
  85. 747bd92 Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 4e4b5a2426" into oc-dev-plus-aosp by Tobias Thierer · 8 years ago
  86. 43026c1 Merge "Merge "Merge "Framework: Add libziparchive dependency" am: 2688a9ab56 am: f70270f94a" into oc-dev-plus-aosp am: 3255899bbd" into oc-dr1-dev-plus-aosp by Andreas Gampe · 8 years ago
  87. bbaeb7a Merge "Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 4e4b5a2426" into oc-dev-plus-aosp am: 81d0134a0f" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  88. 4e57198 Merge "Merge "Merge "Add a convenience method to facilitate tests" into oc-dr1-dev am: 7a4157d7b4" into oc-dr1-dev-plus-aosp am: fb68c413e5" by Android Build Merger (Role) · 8 years ago
  89. cbbc22e Merge "Merge "Merge "Framework: Add libziparchive dependency" am: 2688a9ab56 am: f70270f94a" into oc-dev-plus-aosp am: 3255899bbd" into oc-dr1-dev-plus-aosp by Andreas Gampe · 8 years ago
  90. 484d742 Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev by Bryce Lee · 8 years ago
  91. e6d396d Merge "Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 4e4b5a2426" into oc-dev-plus-aosp am: 81d0134a0f" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  92. ac8d53a Merge "Split out jank data from policy" by TreeHugger Robot · 8 years ago
  93. 9f455b3 Merge "Merge "Merge "Add a convenience method to facilitate tests" into oc-dr1-dev am: 7a4157d7b4" into oc-dr1-dev-plus-aosp am: fb68c413e5" by Android Build Merger (Role) · 8 years ago
  94. 08fa782 Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 4e4b5a2426" into oc-dev-plus-aosp by Tobias Thierer · 8 years ago
  95. 0d81a1b Merge "Merge "Add a convenience method to facilitate tests" into oc-dr1-dev am: 7a4157d7b4" into oc-dr1-dev-plus-aosp by Antony Sargent · 8 years ago
  96. 553e08c Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 4e4b5a2426" into oc-dev-plus-aosp by Tobias Thierer · 8 years ago
  97. d08fe5a Merge "Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 93cc3d86ad" into oc-dev-plus-aosp am: 6a9d07ed22" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  98. efc4962d Merge "Merge "Merge "Add a convenience method to facilitate tests" into oc-dr1-dev am: 7a4157d7b4" into oc-dr1-dev-plus-aosp am: f8aabcf6c8" by Android Build Merger (Role) · 8 years ago
  99. 4a10a10 Merge "Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 93cc3d86ad" into oc-dev-plus-aosp am: 6a9d07ed22" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  100. 4ab64a9 Merge "Merge "Add a convenience method to facilitate tests" into oc-dr1-dev am: 7a4157d7b4" into oc-dr1-dev-plus-aosp by Antony Sargent · 8 years ago