| commit | d3a79db8fe09ac4d5bb404f4bb48a5f66d005db2 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Tue Aug 25 23:39:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 25 23:39:51 2015 +0000 |
| tree | cd872cef5ec386118d0f8684436acf25815487cc | |
| parent | 3b8b865734cf457ffa9ff70c3f2b8bb507d1f4fb [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