tree 2b7a7b99842db9ab4ad297e8157d3185424d2ba5
parent 7e28c0742794e0866cfdd19a586f9e5c9b6cfbb4
parent 0239220a67f168fa30703e07750d1f4907dc99bf
author Narayan Kamath <narayan@google.com> 1396436233 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396436233 +0000

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

* commit '0239220a67f168fa30703e07750d1f4907dc99bf':
  Bring main.mk in sync with master.