OSDN Git Service

Merge "Omit icons from bulk SessionInfo calls." into oc-dr1-dev
authorJeff Sharkey <jsharkey@google.com>
Fri, 9 Jun 2017 20:29:11 +0000 (20:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Jun 2017 20:29:11 +0000 (20:29 +0000)
am: c017d299ce

Change-Id: I57a4f793614c12f32a5e0b8cafa98ef914f2501c


Trivial merge