OSDN Git Service

Merge changes I5d41419a,I763be06c into oc-dev
authorJorim Jaggi <jjaggi@google.com>
Fri, 7 Apr 2017 22:14:59 +0000 (22:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Apr 2017 22:14:59 +0000 (22:14 +0000)
commit90fb71789a8e0c57ffeee3af7f728e17296ba6d3
treefb766d1d297db5c20cfbc0c774d81f6896b3ecd6
parent266d20db8e708f3cfb3a59ff6e90cb41431c09d4
parentbc4bd823d9b7acaf6fd715e24496bab2731de0be
Merge changes I5d41419a,I763be06c into oc-dev
am: bc4bd823d9

Change-Id: I1c23329a3a18fb58d42c13e91e030f589e19025b