| commit | 23f9bb62da2c1b8257ea656c0b14c2e0fca9648b | [log] [tgz] |
|---|---|---|
| author | Alexander Lucas <alexlucas@google.com> | Tue Mar 11 19:18:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 11 19:18:42 2014 +0000 |
| tree | 09b1ce0cf1b180693eb581cc7d3610d9b25fd8e6 | |
| parent | d393b9182094bacaa99d9387c39ff1abbee94977 [diff] | |
| parent | cd1255d19cf03b6f0d463b48e0ad6eb8b5c57b57 [diff] |
am cd1255d1: am 4362d331: resolved conflicts for merge of 6da9c2ed to klp-ub-dev * commit 'cd1255d19cf03b6f0d463b48e0ad6eb8b5c57b57': Updating build metadata for march sample push.