tree 4f5afcd60de614bf8a2d589ab0d2f5f05e6e5e56
parent 4ca6e2e52832d894b6387120e8b1c447121b5135
parent 2f5de9f50460bbd369abd4218e746553f15f24fb
author Narayan Kamath <narayan@google.com> 1396435874 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396435874 +0000

am 2f5de9f5: Merge "Bring main.mk in sync with master."

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