| commit | 8eb81b3b40e4c210387c56d16208a81a0c3c833e | [log] [tgz] |
|---|---|---|
| author | Steve Fung <stevefung@google.com> | Sat Aug 29 01:27:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 29 01:27:43 2015 +0000 |
| tree | 3f8825b90b028e86bd0f77ee9cf86409a6a61da6 | |
| parent | e2ab73c3e7509f168c2cae2db2f666cb8fc570f4 [diff] | |
| parent | d0044fbd97faaf24ead5dd1f08bda96b54ce243e [diff] |
am d0044fbd: resolved conflicts for merge of 1b6972b0 to stage-aosp-master * commit 'd0044fbd97faaf24ead5dd1f08bda96b54ce243e': Add core2md Android build target