OSDN Git Service

Merge changes from topic 'onarevert' into oc-dev
authorAmin Shaikh <ashaikh@google.com>
Fri, 12 May 2017 06:48:13 +0000 (06:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 May 2017 06:48:13 +0000 (06:48 +0000)
am: b747be0769

Change-Id: Ia3b7fbe98a5ffc125ffa9e1ebdc677076814be7c


Trivial merge