| commit | f99a68ada776dee0d52386c56a00328fe6dd8dd7 | [log] [tgz] |
|---|---|---|
| author | Jason Parks <jparks@google.com> | Mon Nov 24 17:33:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 24 17:33:43 2014 +0000 |
| tree | b6cddc28971e75212d03ae59b1b2f259bb03ca3b | |
| parent | 60acff8207f0a6f0a76c3d8f3dc14965f61483ee [diff] | |
| parent | e5a9504442ba0be16b20dc2008bd2017a6669a10 [diff] |
am e5a95044: resolved conflicts for merge of 34d96de0 to lmp-mr1-dev-plus-aosp * commit 'e5a9504442ba0be16b20dc2008bd2017a6669a10': DO NOT MERGE. Bump CTS versions to 5.0_r1.91.