Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / d24bb252cbc0175286707cd1048fa25a39bfab26
  1. d24bb25 docs: Fixed layout of "Build Buzz" page. by Kevin Hufnagle · 9 years ago
  2. 8ba2549 Merge "DO NOT MERGE Check caller for sending media key to global priority session" into nyc-dev by TreeHugger Robot · 9 years ago
  3. 32bd448 Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev by Fan Zhang · 9 years ago
  4. e053061 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485 am: 95b604ccb5 am: fe616288dc -s ours am: 3a20f7ceac am: be2651bb6b am: a7176293fd by Ajay Panicker · 9 years ago
  5. e60aa74 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485 am: 95b604ccb5 am: fe616288dc -s ours am: 3a20f7ceac am: be2651bb6b by Ajay Panicker · 9 years ago
  6. a717629 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485 am: 95b604ccb5 am: fe616288dc -s ours am: 3a20f7ceac by Ajay Panicker · 9 years ago
  7. da12b4b [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 am: cc4fd13113 am: b2094f7c37 -s ours am: 6b16f71975 am: dddb99f020 am: cdf3126615 by Ajay Panicker · 9 years ago
  8. be2651b Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485 am: 95b604ccb5 am: fe616288dc -s ours by Ajay Panicker · 9 years ago
  9. 257cf16 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: 19b09dd0d3 -s ours am: 5977c8b5bc am: cdff42091b am: 9a66565324 -s ours am: dcb78c9cf1 am: 3ed9e7693d am: 853e39d3d9 by Ajay Panicker · 9 years ago
  10. e460ea1 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: 0ea21bc70e -s ours am: 050b9170db am: b367200be4 am: ef74f3b079 -s ours am: 0f464f9d77 am: 1682f67177 am: 13ac17ab3a by Ajay Panicker · 9 years ago
  11. 998001b Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours am: 4f77ca16e4 -s ours am: 959b1aa5b9 am: 7caccc107f am: 1dcec33349 -s ours am: 2ef2d90eaa am: b2e8361c50 am: c147db7a79 by Ajay Panicker · 9 years ago
  12. bd752f7 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 am: cc4fd13113 am: b2094f7c37 -s ours am: 6b16f71975 am: dddb99f020 by Ajay Panicker · 9 years ago
  13. 834f982c [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours am: cb970f408e -s ours am: fafa73a8ac am: 0639d05e55 am: a701b1b6f6 -s ours am: afafdff50e am: d46605ab09 am: fc7822f58a by Ajay Panicker · 9 years ago
  14. 3a20f7c Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485 am: 95b604ccb5 by Ajay Panicker · 9 years ago
  15. cdf3126 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 am: cc4fd13113 am: b2094f7c37 -s ours am: 6b16f71975 by Ajay Panicker · 9 years ago
  16. fe61628 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485 by Ajay Panicker · 9 years ago
  17. 232824e Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: 19b09dd0d3 -s ours am: 5977c8b5bc am: cdff42091b am: 9a66565324 -s ours am: dcb78c9cf1 am: 3ed9e7693d by Ajay Panicker · 9 years ago
  18. ec220f6 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: 0ea21bc70e -s ours am: 050b9170db am: b367200be4 am: ef74f3b079 -s ours am: 0f464f9d77 am: 1682f67177 by Ajay Panicker · 9 years ago
  19. 3e238e3 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours am: 4f77ca16e4 -s ours am: 959b1aa5b9 am: 7caccc107f am: 1dcec33349 -s ours am: 2ef2d90eaa am: b2e8361c50 by Ajay Panicker · 9 years ago
  20. 93a6221 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours am: cb970f408e -s ours am: fafa73a8ac am: 0639d05e55 am: a701b1b6f6 -s ours am: afafdff50e am: d46605ab09 by Ajay Panicker · 9 years ago
  21. dddb99f [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 am: cc4fd13113 am: b2094f7c37 -s ours by Ajay Panicker · 9 years ago
  22. 853e39d Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: 19b09dd0d3 -s ours am: 5977c8b5bc am: cdff42091b am: 9a66565324 -s ours am: dcb78c9cf1 by Ajay Panicker · 9 years ago
  23. 13ac17a [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: 0ea21bc70e -s ours am: 050b9170db am: b367200be4 am: ef74f3b079 -s ours am: 0f464f9d77 by Ajay Panicker · 9 years ago
  24. 3ed9e76 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: 19b09dd0d3 -s ours am: 5977c8b5bc am: cdff42091b am: 9a66565324 -s ours by Ajay Panicker · 9 years ago
  25. c147db7 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours am: 4f77ca16e4 -s ours am: 959b1aa5b9 am: 7caccc107f am: 1dcec33349 -s ours am: 2ef2d90eaa by Ajay Panicker · 9 years ago
  26. 95b604c Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev by Ajay Panicker · 9 years ago
  27. fc7822f [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours am: cb970f408e -s ours am: fafa73a8ac am: 0639d05e55 am: a701b1b6f6 -s ours am: afafdff50e by Ajay Panicker · 9 years ago
  28. edc31f9 Merge "Fix some at links." into nyc-dev by Elliot Waite · 9 years ago
  29. 6b16f71 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 am: cc4fd13113 by Ajay Panicker · 9 years ago
  30. 1682f67 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: 0ea21bc70e -s ours am: 050b9170db am: b367200be4 am: ef74f3b079 -s ours by Ajay Panicker · 9 years ago
  31. b2e8361 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours am: 4f77ca16e4 -s ours am: 959b1aa5b9 am: 7caccc107f am: 1dcec33349 -s ours by Ajay Panicker · 9 years ago
  32. d46605a [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours am: cb970f408e -s ours am: fafa73a8ac am: 0639d05e55 am: a701b1b6f6 -s ours by Ajay Panicker · 9 years ago
  33. b2094f7 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 by Ajay Panicker · 9 years ago
  34. 09c3df0 DO NOT MERGE Check caller for sending media key to global priority session by Jaewan Kim · 9 years ago
  35. 9013d67 Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev am: 22046e7323 am: e4f60787f3 am: ce8032ebbb by Marie Janssen · 9 years ago
  36. 6f514cc Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27 am: e3812fc048 by Marie Janssen · 9 years ago
  37. cc4fd13 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 by Ajay Panicker · 9 years ago
  38. dcb78c9 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: 19b09dd0d3 -s ours am: 5977c8b5bc am: cdff42091b by Ajay Panicker · 9 years ago
  39. 60bf672 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev by TreeHugger Robot · 9 years ago
  40. 0f464f9 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: 0ea21bc70e -s ours am: 050b9170db am: b367200be4 by Ajay Panicker · 9 years ago
  41. 2ef2d90 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours am: 4f77ca16e4 -s ours am: 959b1aa5b9 am: 7caccc107f by Ajay Panicker · 9 years ago
  42. 0ed17e5 Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev am: 22046e7323 am: e4f60787f3 by Marie Janssen · 9 years ago
  43. afafdff [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours am: cb970f408e -s ours am: fafa73a8ac am: 0639d05e55 by Ajay Panicker · 9 years ago
  44. 532d2b1 Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27 by Marie Janssen · 9 years ago
  45. 9a66565 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: 19b09dd0d3 -s ours am: 5977c8b5bc by Ajay Panicker · 9 years ago
  46. ef74f3b [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: 0ea21bc70e -s ours am: 050b9170db by Ajay Panicker · 9 years ago
  47. 1dcec33 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours am: 4f77ca16e4 -s ours am: 959b1aa5b9 by Ajay Panicker · 9 years ago
  48. ce8032e Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev am: 22046e7323 by Marie Janssen · 9 years ago
  49. a701b1b [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours am: cb970f408e -s ours am: fafa73a8ac by Ajay Panicker · 9 years ago
  50. e3812fc Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f am: 3106e3ae27 by Marie Janssen · 9 years ago
  51. cdff420 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: 19b09dd0d3 -s ours by Ajay Panicker · 9 years ago
  52. b367200 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: 0ea21bc70e -s ours by Ajay Panicker · 9 years ago
  53. 7caccc1 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours am: 4f77ca16e4 -s ours by Ajay Panicker · 9 years ago
  54. e4f6078 Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev by Marie Janssen · 9 years ago
  55. 3106e3a Fix setPairingConfirmation permissions issue (2/2) am: 93326cfd9f by Marie Janssen · 9 years ago
  56. 0639d05 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours am: cb970f408e -s ours by Ajay Panicker · 9 years ago
  57. 5977c8b Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev by Ajay Panicker · 9 years ago
  58. 050b917 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) by Ajay Panicker · 9 years ago
  59. 959b1aa Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours by Ajay Panicker · 9 years ago
  60. 28d8716 Fix some at links. by Elliot Waite · 9 years ago
  61. 22046e7 Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev by TreeHugger Robot · 9 years ago
  62. fafa73a [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours by Ajay Panicker · 9 years ago
  63. 19b09dd Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev by TreeHugger Robot · 9 years ago
  64. 4f77ca1 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 by Ajay Panicker · 9 years ago
  65. cb970f4 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 by Ajay Panicker · 9 years ago
  66. 3d995d6 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e by Ajay Panicker · 9 years ago
  67. 3758253 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a by Ajay Panicker · 9 years ago
  68. a278a1e Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev by Ajay Panicker · 9 years ago
  69. 271e34d [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a by Ajay Panicker · 9 years ago
  70. bb9b38b [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) by Ajay Panicker · 9 years ago
  71. 204da8a Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev by TreeHugger Robot · 9 years ago
  72. 7980e45 Merge "Docs: Fix manifest example for ARC" into nyc-dev by TreeHugger Robot · 9 years ago
  73. c9905d9 Temporary redirect for CMake Variables list. by Adarsh Fernando · 9 years ago
  74. a1c28fa Merge "update metadata for the studio landing page cards (for 2.2 content) edit landing page banner ("a dozen" --> "20")" into nyc-dev by Scott Main · 9 years ago
  75. 51365c3 Fix NPE for WifiConfiguration in AccessPoint. by Fan Zhang · 9 years ago
  76. 0e98b64 update metadata for the studio landing page cards (for 2.2 content) by smain@google.com · 9 years ago
  77. e5e9265 Merge "Small change for new sample test code" into nyc-dev by Mary Yanchar · 9 years ago
  78. 99ec81a Merge changes from topic 'n-versioncode' into nyc-dev by Scott Main · 9 years ago
  79. fba3187 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7 am: 7fd31ca09c am: badb5f2a03 by Sudheer Shanka · 9 years ago
  80. 4c77b60 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea am: 71bb55afd9 am: 62c6ce4ca0 by Sudheer Shanka · 9 years ago
  81. 1c2e884 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7 am: 7fd31ca09c by Sudheer Shanka · 9 years ago
  82. 7efc56c Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09 am: 8fedc773fc am: 827f465492 by Sudheer Shanka · 9 years ago
  83. 5753af8 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea am: 71bb55afd9 by Sudheer Shanka · 9 years ago
  84. badb5f2 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7 by Sudheer Shanka · 9 years ago
  85. 8d302da Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09 am: 8fedc773fc by Sudheer Shanka · 9 years ago
  86. 62c6ce4 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea by Sudheer Shanka · 9 years ago
  87. 827f465 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09 by Sudheer Shanka · 9 years ago
  88. 7fd31ca Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours by Sudheer Shanka · 9 years ago
  89. 71bb55a DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours by Sudheer Shanka · 9 years ago
  90. 8fedc77 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours by Sudheer Shanka · 9 years ago
  91. eacf98bf DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours am: 20bafe850d am: 923f622c15 am: 042fb63071 by Sudheer Shanka · 9 years ago
  92. 3c7e989 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours am: 20bafe850d am: 923f622c15 by Sudheer Shanka · 9 years ago
  93. 29e4cd6 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df by Sudheer Shanka · 9 years ago
  94. 3f8c974 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5 am: 426ba52b42 -s ours am: 1781d2bd3b am: f428d49b12 am: 21d4b84547 by Sudheer Shanka · 9 years ago
  95. 1310d53 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 by Sudheer Shanka · 9 years ago
  96. 2f0228c Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f by Sudheer Shanka · 9 years ago
  97. 94b739d Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5 am: 426ba52b42 -s ours am: 1781d2bd3b am: f428d49b12 by Sudheer Shanka · 9 years ago
  98. 9d3efc7 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036 -s ours am: e44f8fcca4 am: 6b77a4ee55 am: 91ff18a1f6 by Sudheer Shanka · 9 years ago
  99. 042fb630 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours am: 20bafe850d by Sudheer Shanka · 9 years ago
  100. b235bc6 Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 by Sudheer Shanka · 9 years ago