OSDN Git Service

resolved conflicts for merge of 4197cfdb to mnc-dev-plus-aosp
authorPavlin Radoslavov <pavlin@google.com>
Tue, 23 Jun 2015 02:35:23 +0000 (19:35 -0700)
committerPavlin Radoslavov <pavlin@google.com>
Tue, 23 Jun 2015 02:35:23 +0000 (19:35 -0700)
commit123d77a395b12463186e24b09c0cebcb3fe9f185
tree79bd84894bf406530b3cf79dd91228772af17252
parentc6da677026f58436ed8d9763f79662c0e88cc736
parent4197cfdbd36d9f7f213df11b6fee795f22c867fd
resolved conflicts for merge of 4197cfdb to mnc-dev-plus-aosp

Change-Id: I01e295c4f86e821f84e45fbf1985088dd1a5347a
osi/src/config.c