OSDN Git Service

am 2f5de9f5: Merge "Bring main.mk in sync with master."
authorNarayan Kamath <narayan@google.com>
Wed, 2 Apr 2014 10:51:14 +0000 (10:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Apr 2014 10:51:14 +0000 (10:51 +0000)
* commit '2f5de9f50460bbd369abd4218e746553f15f24fb':
  Bring main.mk in sync with master.


Trivial merge