diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2013-02-04 13:16:41 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-04 13:16:41 -0800 |
| commit | 350b0787921d07146af78c4b9b3ea1e04cf857a6 (patch) | |
| tree | 3271222b09eabcb0c82eb072c76b7a3d8b455a87 | |
| parent | a9eddb988ca6ad9b32eaa7316496f4fca95855a2 (diff) | |
| parent | f5e5e76065d9dbc6f2334e4bee4af233aaebc14a (diff) | |
| download | device_common-350b0787921d07146af78c4b9b3ea1e04cf857a6.tar.gz device_common-350b0787921d07146af78c4b9b3ea1e04cf857a6.tar.bz2 device_common-350b0787921d07146af78c4b9b3ea1e04cf857a6.zip | |
am f5e5e760: resolved conflicts for merge of 16e6db4c to jb-mr1-dev-plus-aosp
# Via Android Git Automerger (2) and Jean-Baptiste Queru (2)
* commit 'f5e5e76065d9dbc6f2334e4bee4af233aaebc14a':
Don't delete tilapia files when preparing blob lists.
0 files changed, 0 insertions, 0 deletions