OSDN Git Service

Merge changes from topic 'am-4d21b9824d8247648c328224f533af1e' into oc-dr1-dev-plus...
authorRam Mohan M <ram.mohan@ittiam.com>
Sat, 10 Jun 2017 01:39:22 +0000 (01:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 10 Jun 2017 01:39:22 +0000 (01:39 +0000)
am: e1b89590cc

Change-Id: I6a64ecc1d18b6fc0a101199bb67dfa40ae408379


Trivial merge