OSDN Git Service

Merge "resolved conflicts for merge of ecfc97f7 to mnc-dev" into mnc-dev
authorSimon Wilson <simonwilson@google.com>
Wed, 24 Jun 2015 23:13:51 +0000 (23:13 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 24 Jun 2015 23:14:07 +0000 (23:14 +0000)
commitb7b7aedeb3c960890e3842ec8e729dbd10077ae4
treef3b4ce7ecca8127dc715f3c3220fb138ca0d0ec9
parent914811a9f283ed3d8aa826abddf8c11f6167dc14
parent6d5ddc32abcea651afdfdd4c2f6435506007aede
Merge "resolved conflicts for merge of ecfc97f7 to mnc-dev" into mnc-dev
core/Makefile