summaryrefslogtreecommitdiffstats
path: root/minadbd/minadbd.cpp
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2017-01-20 05:25:42 +0100
committerandroid-build-merger <android-build-merger@google.com>2017-01-20 05:25:42 +0100
commit9af09c0505ed52d5aaa8a8bf9accd942a4303260 (patch)
tree7eca042f8c835574b443c0012e07588c13ac8869 /minadbd/minadbd.cpp
parentDO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733 am: 8e267878cc am: 99e38bf254 (diff)
parentDO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733 am: 8e267878cc (diff)
downloadandroid_bootable_recovery-9af09c0505ed52d5aaa8a8bf9accd942a4303260.tar
android_bootable_recovery-9af09c0505ed52d5aaa8a8bf9accd942a4303260.tar.gz
android_bootable_recovery-9af09c0505ed52d5aaa8a8bf9accd942a4303260.tar.bz2
android_bootable_recovery-9af09c0505ed52d5aaa8a8bf9accd942a4303260.tar.lz
android_bootable_recovery-9af09c0505ed52d5aaa8a8bf9accd942a4303260.tar.xz
android_bootable_recovery-9af09c0505ed52d5aaa8a8bf9accd942a4303260.tar.zst
android_bootable_recovery-9af09c0505ed52d5aaa8a8bf9accd942a4303260.zip
Diffstat (limited to 'minadbd/minadbd.cpp')
0 files changed, 0 insertions, 0 deletions