OSDN Git Service

Merge changes I9d050e54,Ic487036a
authorJosh Gao <jmgao@google.com>
Fri, 4 Nov 2016 23:14:24 +0000 (23:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 4 Nov 2016 23:14:24 +0000 (23:14 +0000)
commit6a2fa2a46786a5473a9d2d467626431900b79770
treebc468d08c6292f257f9cb8d0b95320794b998d79
parent6c73ed9602e699728cd5172296d85b6663a0a794
parentbf67936b4b23ff75f4de7976848b425d74ca2de8
Merge changes I9d050e54,Ic487036a
am: bf67936b4b

Change-Id: I588d34c4acfb70478af8a2b831adb23ddb897475