tree 2c113dc26f0d40be5ff00f497d93ce91bc3933cb
parent e8826ba3dd6c03d40a1835148e9b79b0ee503daf
parent a230a43204e3567d93a2d914123b21c14bdf495d
author Olawale Ogunwale <ogunwale@google.com> 1418853305 +0000
committer android-build-merger <android-build-merger@google.com> 1418853305 +0000

am 486a9942: Merge "[ActivityManager] Use synchronized to protect object" automerge: e3b07b4
automerge: a230a43

* commit 'a230a43204e3567d93a2d914123b21c14bdf495d':
  [ActivityManager] Use synchronized to protect object