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)
commite250aff83f787459d570b7c6b4e37e65ede40d3d
tree93b9f4aa6cdf47b7158b808ef4ab4a05d2c63cb3
parent98edd972d0f3bb445fb851736ee52fbda455931f
parentcd9ce19e9ce34db6201bdb054c40c3b9e766d2d8
Merge changes I7f32dc9f,I9d88ddb1
am: cd9ce19e9c

Change-Id: I3294cceacf564de140e374068c5ed3974df1875c