tree e700d9914b1dcacc669807e7ff6226b371027a5f
parent 2e0c629448d28b6b4676ec29070d73551dca2029
parent c16340c646b7c89f6ae40fcbf9773d0ecfa5685d
author Jeff Sharkey <jsharkey@android.com> 1515462569 +0000
committer android-build-merger <android-build-merger@google.com> 1515462569 +0000

Merge changes from topic "resgidz" am: a7004e5fed am: b162da3a47
am: c16340c646

Change-Id: Iaf01b79c1e51f4cba06ee9ea6227c00a3cec4d4d