tree cec6e4e1e42f1448da3a5dea0a2ec88402d21d6b
parent 5b565429460eaa67be74e675299c1ab5b8f651f7
parent 3fabcdb45a8d0765ea3bbd86a1a8aba6808f2718
author Jaewan Kim <jaewan@google.com> 1507615264 +0000
committer android-build-merger <android-build-merger@google.com> 1507615264 +0000

Merge "MediaSessionService: Prevent getActiveSessions() from growing infinitely" into oc-mr1-dev am: 9bc71c4922
am: 3fabcdb45a

Change-Id: I84e5c9339250ed79e8cfdfefd9baddd2ceba3a78