| commit | a80ff4d0dca5cc353fbc177b30a394775bd6d48a | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Tue Mar 11 09:17:12 2014 +0900 |
| committer | Lorenzo Colitti <lorenzo@google.com> | Tue Mar 11 09:17:12 2014 +0900 |
| tree | 9d62bf0b8fcc54f5abb60679502e60000593640b | |
| parent | fcdb0f99f51bb2cddf093f7831fb24e504501765 [diff] | |
| parent | c2549b4b4e2437aca29497c29ebe0b17b6214549 [diff] |
resolved conflicts for merge of c2549b4b to klp-dev-plus-aosp Change-Id: I70c8ae70d1d39892e66668ed5c1e69b54d665231