OSDN Git Service

Merge "Recording activity notification: return list of configuration" into nyc-dev...
authorJean-Michel Trivi <jmtrivi@google.com>
Mon, 23 May 2016 21:10:26 +0000 (21:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 May 2016 21:10:26 +0000 (21:10 +0000)
am: 7399079b5b

* commit '7399079b5b6af59aceba6c4a4070fdf7afe432c0':
  Only resuming starting dontWaitForPause activity once

Change-Id: I28a1b0fb32c521ae990e96375fdb819dc12c95ca


Trivial merge