OSDN Git Service

resolved conflicts for merge of 145cf576 to mnc-dev-plus-aosp
authorArman Uguray <armansito@google.com>
Tue, 4 Aug 2015 22:51:10 +0000 (15:51 -0700)
committerArman Uguray <armansito@google.com>
Tue, 4 Aug 2015 22:51:10 +0000 (15:51 -0700)
commit75a2a9787537c461ddd6521513f50644ecc9b37d
tree9593d06a8e223d1e8d8ea90301d09bc60d83c419
parent74cdb62a51542ff09c0c0ce3913e07c1c2f51b74
parent145cf576b55bc1eba7818d28e580a7729c94deea
resolved conflicts for merge of 145cf576 to mnc-dev-plus-aosp

Change-Id: I717d2959e50309b272b3b76851015871b5095fc1
osi/Android.mk