| commit | 133415d55129b6b29e2bf4454fcbf07c9957f251 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Thu Apr 09 00:31:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 09 00:31:56 2015 +0000 |
| tree | ccccca808a7db4ddbc4159979ee9180272af1690 | |
| parent | e2925213a73033451cd30dae620a0ce1abbc3a24 [diff] | |
| parent | 4acabe0fd8778aad079ed4b3a9bbe011db12ece3 [diff] |
am 4acabe0f: resolved conflicts for merge of f5b9830b to stage-aosp-master * commit '4acabe0fd8778aad079ed4b3a9bbe011db12ece3': Better way to package up the otatools-package.