| commit | 23bf7212ce4ee925569eba7a0c9e4197981f9a29 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Tue Apr 15 21:02:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 15 21:02:38 2014 +0000 |
| tree | 960c7b18e95c3a3454acf9151577853ebb6db4e4 | |
| parent | b29c3e64d25254c7dfd67586ff4d5881ba5fa492 [diff] | |
| parent | 51f0d3f58a5c04ee328778bc97e42dc10cfa41ad [diff] |
am 51f0d3f5: resolved conflicts for merge of 70555a16 to master * commit '51f0d3f58a5c04ee328778bc97e42dc10cfa41ad': Allow to build target-files.zip in sdk build.