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)
commit0239220a67f168fa30703e07750d1f4907dc99bf
tree4f5afcd60de614bf8a2d589ab0d2f5f05e6e5e56
parent4ca6e2e52832d894b6387120e8b1c447121b5135
parent2f5de9f50460bbd369abd4218e746553f15f24fb
am 2f5de9f5: Merge "Bring main.mk in sync with "

* commit '2f5de9f50460bbd369abd4218e746553f15f24fb':
  Bring main.mk in sync with master.