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