diff options
| author | Raphael Moll <raphael@google.com> | 2013-05-03 23:49:34 -0700 |
|---|---|---|
| committer | Raphael Moll <raphael@google.com> | 2013-05-03 23:49:34 -0700 |
| commit | 01808a5b1248df3628cafafc22a343cae3fa4880 (patch) | |
| tree | 4f71e9fbc853c2e7d02df78cf5b4b092537e18c7 /sdkmanager/libs/sdklib/src | |
| parent | 07f6904f97f1b5de82a7c76ef828fde65559706b (diff) | |
| parent | c5fd733f1d080207801ac2ab5197eb9d6b346071 (diff) | |
| download | sdk-01808a5b1248df3628cafafc22a343cae3fa4880.zip sdk-01808a5b1248df3628cafafc22a343cae3fa4880.tar.gz sdk-01808a5b1248df3628cafafc22a343cae3fa4880.tar.bz2 | |
resolved conflicts for merge of c5fd733f to jb-mr1-dev-plus-aosp
Change-Id: I5e5ef53138eb5b6c0935be74c23c60248503da79
Diffstat (limited to 'sdkmanager/libs/sdklib/src')
0 files changed, 0 insertions, 0 deletions