OSDN Git Service

Merge changes I7f32dc9f,I9d88ddb1
authorJosh Gao <jmgao@google.com>
Fri, 11 Nov 2016 22:30:57 +0000 (22:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Nov 2016 22:30:57 +0000 (22:30 +0000)
am: cd9ce19e9c

Change-Id: I3294cceacf564de140e374068c5ed3974df1875c


Trivial merge