| commit | 73a12c2b32bfae2795a1b6ced5ce72fa1f331ea2 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Sep 01 18:36:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 01 18:36:21 2015 +0000 |
| tree | 66b9c9800606b62d12b18eb90de92a29e02d312c | |
| parent | 7c617d8c98320c4a5a53e9de46d32ded65199573 [diff] | |
| parent | 1fee9957f5081ece6c44ffcf28f6bb7b42abd152 [diff] |
am 59224c95: resolved conflicts for merge of 46603db5 to mnc-dr-dev-plus-aosp * commit '59224c9537c0a0e96e3ead81084133ecab41c598': Minimal fix for adb backup.