OSDN Git Service

am 0239220a: am 2f5de9f5: Merge "Bring main.mk in sync with master."
authorNarayan Kamath <narayan@google.com>
Wed, 2 Apr 2014 10:57:13 +0000 (10:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Apr 2014 10:57:13 +0000 (10:57 +0000)
commit823f0ba6b8b52566d453d4770ac4e09f89b90842
tree2b7a7b99842db9ab4ad297e8157d3185424d2ba5
parent7e28c0742794e0866cfdd19a586f9e5c9b6cfbb4
parent0239220a67f168fa30703e07750d1f4907dc99bf
am 0239220a: am 2f5de9f5: Merge "Bring main.mk in sync with "

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