| commit | 823f0ba6b8b52566d453d4770ac4e09f89b90842 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Wed Apr 02 10:57:13 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 02 10:57:13 2014 +0000 |
| tree | 2b7a7b99842db9ab4ad297e8157d3185424d2ba5 | |
| parent | 7e28c0742794e0866cfdd19a586f9e5c9b6cfbb4 [diff] | |
| parent | 0239220a67f168fa30703e07750d1f4907dc99bf [diff] |
am 0239220a: am 2f5de9f5: Merge "Bring main.mk in sync with master." * commit '0239220a67f168fa30703e07750d1f4907dc99bf': Bring main.mk in sync with master.