OSDN Git Service

Merge changes from topic '7_CLS_topic' into oc-dr1-dev am: b8ad0fd508
authorSohani Rao <sohanirao@google.com>
Thu, 22 Jun 2017 17:47:23 +0000 (17:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Jun 2017 17:47:23 +0000 (17:47 +0000)
am: cabe9d5cc5

Change-Id: I9424612fea0526024e0a8a28812cc66cc334a421


Trivial merge