tree 2a35f0e38e3460f788acdeb7d12f1a1d3f9c8e9e
parent ae8b7259f59eb3208517f6e3558b9ba991f39b96
parent c991879f29c399ad7ede2b5c2c82e2e748f5e0df
author Jean-Michel Trivi <jmtrivi@google.com> 1464036964 +0000
committer android-build-merger <android-build-merger@google.com> 1464036964 +0000

Merge "Recording activity notification: return list of configuration" into nyc-dev
am: c991879f29

* commit 'c991879f29c399ad7ede2b5c2c82e2e748f5e0df':
  Recording activity notification: return list of configuration

Change-Id: I926b2cacd7a645ec42f249a0d45a6a822f05eded