| commit | 933c03dfcf8ed170e9f2c40439dc20cc6536cfe2 | [log] [tgz] |
|---|---|---|
| author | Tim Kilbourn <tkilbourn@google.com> | Thu Mar 13 10:14:11 2014 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 13 10:14:11 2014 -0700 |
| tree | c66269578b8db12d3a2c5fe74d64310661ee60aa | |
| parent | 620f19af47d7783151ce554d8cfe4d56fd543d07 [diff] | |
| parent | 957fa659c23ed74b9d3f18b25fdf162339ee6742 [diff] |
am 957fa659: resolved conflicts for merge of 9eecf3fc to master * commit '957fa659c23ed74b9d3f18b25fdf162339ee6742': Add new support libs into the sdk build.