| commit | 5ad4385b7ab00210eae295de5ea8f2acb53175e1 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Wed Aug 26 00:09:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 26 00:09:05 2015 +0000 |
| tree | 9697d5d96c3c19dc1eb3d1e67716715adc3a3161 | |
| parent | fbbac2e76e98bb178a20900175bff97e24bb439d [diff] | |
| parent | e9a98cd68703eda10c35fd98eb0afd43632c8e69 [diff] |
am e9a98cd6: am 87e6b493: am d3a79db8: am afc5ab39: am c6e087ad: resolved conflicts for merge of 2bcfbe7e to lmp-mr1-ub-dev * commit 'e9a98cd68703eda10c35fd98eb0afd43632c8e69': add otatools-package target