OSDN Git Service

resolved conflicts for merge of 145cf576 to mnc-dr-dev-plus-aosp
authorArman Uguray <armansito@google.com>
Tue, 4 Aug 2015 22:46:25 +0000 (15:46 -0700)
committerArman Uguray <armansito@google.com>
Tue, 4 Aug 2015 22:46:25 +0000 (15:46 -0700)
commite9e080f7ca72123f8925dda65e545a8d3fc5e3ee
tree59f35c68f2aaf4d148f1976b4816de84c815016d
parentb7abcb36486374dfe3f0b4e00e411544a9b82d01
parent145cf576b55bc1eba7818d28e580a7729c94deea
resolved conflicts for merge of 145cf576 to mnc-dr-dev-plus-aosp

Change-Id: I1452632bb670d639c5c2b4d07a3045b9ccaa88bd
osi/Android.mk