| commit | cd1255d19cf03b6f0d463b48e0ad6eb8b5c57b57 | [log] [tgz] |
|---|---|---|
| author | Alexander Lucas <alexlucas@google.com> | Tue Mar 11 17:44:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 11 17:44:32 2014 +0000 |
| tree | 487ff992c7ca5835836067d7feea51a81a4a3402 | |
| parent | 58c6156e0b9a33ed64af5e5849ba1a80fd5ac0a2 [diff] | |
| parent | 4362d331f0ee5257b881a346fce63348e880fa1c [diff] |
am 4362d331: resolved conflicts for merge of 6da9c2ed to klp-ub-dev * commit '4362d331f0ee5257b881a346fce63348e880fa1c': Updating build metadata for march sample push.