diff options
| author | Bart Sears <bsears@google.com> | 2015-03-27 01:25:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-27 01:25:58 +0000 |
| commit | 921a5f8940fa3a215cab807c8fbbbca428233e9b (patch) | |
| tree | 8c5e1828fb3fe2d42345cc695e74100abc9994fa /core/dpi_specific_apk.mk | |
| parent | 879c3bf31ef39983f1ce6eb5e2bbdef8293d7467 (diff) | |
| parent | c3868ae37130a6c1c1a650d78bc26f394439d796 (diff) | |
| download | build-921a5f8940fa3a215cab807c8fbbbca428233e9b.zip build-921a5f8940fa3a215cab807c8fbbbca428233e9b.tar.gz build-921a5f8940fa3a215cab807c8fbbbca428233e9b.tar.bz2 | |
am c3868ae3: (-s ours) resolved conflicts for merge of 6d607ee7 to lmp-mr1-dev-plus-aosp
* commit 'c3868ae37130a6c1c1a650d78bc26f394439d796':
DO NOT MERGE - Bump version to 5.1.1
Diffstat (limited to 'core/dpi_specific_apk.mk')
0 files changed, 0 insertions, 0 deletions