| commit | 19753f458bc5ec546f4c5bb304072a53b4f9357f | [log] [tgz] |
|---|---|---|
| author | Justin Koh <justinkoh@google.com> | Tue Feb 04 23:42:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 04 23:42:07 2014 +0000 |
| tree | b0773614ff034555a2dc532f8a5201a7afdda3f4 | |
| parent | 01ce19c95f358ac8ef9bb939d2637ac976320401 [diff] | |
| parent | bbfebfad0d8ad002995bb1005b61a35b42a8ce35 [diff] |
am bbfebfad: resolved conflicts for merge of 303d2755 to klp-modular-dev-plus-aosp * commit 'bbfebfad0d8ad002995bb1005b61a35b42a8ce35': Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT.