OSDN Git Service

Merge "resolved conflicts for merge of a86fcc29 to master"
authorKenny Root <kroot@google.com>
Mon, 9 Apr 2012 22:12:58 +0000 (15:12 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 9 Apr 2012 22:12:58 +0000 (15:12 -0700)
commit883a122808e3f3f67d0023df44295ca9dedb9fd2
treee2c4c713d391606e6c8e383c795cb76d63408060
parent4394aaef7eb02116bca4ef8781201d4559ee99db
parentf32dc71e49656e16fc8e178f7436706a47e8af52
Merge "resolved conflicts for merge of a86fcc29 to master"
core/Makefile