| commit | afc5ab39d84e9fc5fecbcd3c5a77fe4f956ff825 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Tue Aug 25 23:30:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 25 23:30:14 2015 +0000 |
| tree | abc69f7fde57d633224d9fa576ff70882e9cea6a | |
| parent | ca19158e034d6e0f5a605698c0f303893a2b9248 [diff] | |
| parent | c6e087adc420ca08bfea8613c07aa51e1b4a2e3e [diff] |
am c6e087ad: resolved conflicts for merge of 2bcfbe7e to lmp-mr1-ub-dev * commit 'c6e087adc420ca08bfea8613c07aa51e1b4a2e3e': add otatools-package target