OSDN Git Service

Merge changes I5d41419a,I763be06c into oc-dev am: bc4bd823d9
authorJorim Jaggi <jjaggi@google.com>
Fri, 7 Apr 2017 22:21:56 +0000 (22:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Apr 2017 22:21:56 +0000 (22:21 +0000)
commit0da214bc73c0241420da7dd90915e93eb662d6cf
tree8f9b6698c352d76a3780c87cd537c29929b7fe96
parent84b3954974a07c3df4596404a45897e6bccbce25
parent90fb71789a8e0c57ffeee3af7f728e17296ba6d3
Merge changes I5d41419a,I763be06c into oc-dev am: bc4bd823d9
am: 90fb71789a

Change-Id: I689f16b796cbb7a6157c5a5fcc9242ab4c93c0f6