diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-06-17 17:27:29 -0700 |
|---|---|---|
| committer | Deepanshu Gupta <deepanshu@google.com> | 2014-06-17 17:27:29 -0700 |
| commit | 40c2c69bd8a6fda34a3ed7d78cf53b092b0ffa67 (patch) | |
| tree | 4473a0cdacfe6803ffdf48487f466a59238627e4 /scripts | |
| parent | 5405d94a47f7f48ef43aeca0e3b5e7ca56ac6b39 (diff) | |
| parent | c91c719f91fe9b24c136469a34e848899e67b11f (diff) | |
| download | android_development-40c2c69bd8a6fda34a3ed7d78cf53b092b0ffa67.tar.gz android_development-40c2c69bd8a6fda34a3ed7d78cf53b092b0ffa67.tar.bz2 android_development-40c2c69bd8a6fda34a3ed7d78cf53b092b0ffa67.zip | |
resolved conflicts for merge of c91c719f to klp-modular-dev-plus-aosp
Change-Id: I0c942398f6acecf072da1a2148fbc900a609e870
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions