OSDN Git Service

resolve merge conflicts of 0a5d9ebb0b15976b47eaff77bb66a257b8b114bb to stage-aosp...
authorJakub Pawlowski <jpawlowski@google.com>
Wed, 9 Aug 2017 16:06:57 +0000 (16:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Aug 2017 16:06:57 +0000 (16:06 +0000)
commitfe37b1e8f8ec9adcedf5b7be3340fb2be1e34a9d
tree4bdd297ba9d9811330e96d243fd45391a8847a1b
parent3bf1fb856e32405e76de6706cc66ac3a160fe880
parentca61556a761ea6f9581782768222336e518f0d16
resolve merge conflicts of 0a5d9ebb0b15976b47eaff77bb66a257b8b114bb to stage-aosp-master
am: ca61556a76

Change-Id: I7d93c7bfd2fdd3bb0b80e0ef5400dd2432e035ac