OSDN Git Service

Merge "Bring main.mk in sync with master."
authorNarayan Kamath <narayan@google.com>
Wed, 2 Apr 2014 10:45:06 +0000 (10:45 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 2 Apr 2014 10:45:07 +0000 (10:45 +0000)
commit2f5de9f50460bbd369abd4218e746553f15f24fb
tree4f5afcd60de614bf8a2d589ab0d2f5f05e6e5e56
parent38c0ac7386f1956cf06079960886275c483e0706
parentd5fb7826823fa3fb45f8f06c9c1a781dd60210f8
Merge "Bring main.mk in sync with master."