diff options
| author | Colin Cross <ccross@android.com> | 2013-06-24 17:19:43 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2013-06-24 17:19:43 -0700 |
| commit | b1a9f8cf4b15a861ab998a4c5f0c69068f22c62a (patch) | |
| tree | 747a6b8891d0c685d805a9c254760a46800adccb /adb/adb.h | |
| parent | 39021a48a0e0687c654423acd5a4c99a1d79440d (diff) | |
| parent | b6c602859496e212db78435e2b05ec9418189d6c (diff) | |
| download | system_core-b1a9f8cf4b15a861ab998a4c5f0c69068f22c62a.zip system_core-b1a9f8cf4b15a861ab998a4c5f0c69068f22c62a.tar.gz system_core-b1a9f8cf4b15a861ab998a4c5f0c69068f22c62a.tar.bz2 | |
resolved conflicts for merge of b6c60285 to stage-aosp-master
Change-Id: I5afba55b668065499fa28369cf217d4f5eafab4a
Diffstat (limited to 'adb/adb.h')
0 files changed, 0 insertions, 0 deletions