| commit | feca5313b73dbc163d6a73a6e93ee918e83e3bc7 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Thu Sep 24 02:37:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 24 02:37:49 2015 +0000 |
| tree | 8c90c98cc2b808333b47e2b7d64b1eac87eadc03 | |
| parent | 418868a4889fb86a361e557c4831760918bc82da [diff] | |
| parent | 2f9f1fb32f8e2320cbb515c82a3b471da4b6e848 [diff] |
am 2f9f1fb3: resolved conflicts for 964f06b1 to stage-aosp-master * commit '2f9f1fb32f8e2320cbb515c82a3b471da4b6e848': Re-implement mma/mmma using make goals.