OSDN Git Service

resolve merge conflicts of ccd27b0 to stage-aosp-master
authorDavid 'Digit' Turner <digit@google.com>
Thu, 23 Jun 2016 08:35:49 +0000 (10:35 +0200)
committerDavid 'Digit' Turner <digit@google.com>
Thu, 23 Jun 2016 08:35:49 +0000 (10:35 +0200)
commit25d580912de82d0e359182b36b5c519f5a0d6766
tree1bfbded257abaafe163ea0a09326a8b24d712e40
parentc963b671f3f9e703894cbbdb7dca914eaee876f0
parentccd27b02bfee6db992bc6590270640403103366a
resolve merge conflicts of ccd27b0 to stage-aosp-master

Change-Id: Ic5a6bb461c60646d7f9798cb1bf99110c6592f91
rild/rild.c