OSDN Git Service

Merge changes I9d050e54,Ic487036a am: bf67936b4b
authorJosh Gao <jmgao@google.com>
Fri, 4 Nov 2016 23:18:00 +0000 (23:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 4 Nov 2016 23:18:00 +0000 (23:18 +0000)
am: 6a2fa2a467

Change-Id: If1f1fe950e00c3f170587178ad69ba74fe1c3e26


Trivial merge