| commit | c98496f27a71f082b66b8c62bae8610fb3415410 | [log] [tgz] |
|---|---|---|
| author | Alexander Lucas <alexlucas@google.com> | Wed Mar 12 08:22:32 2014 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 12 08:22:32 2014 -0700 |
| tree | f5f7e7265affc20e1ae8a5937792106a13f1ca0a | |
| parent | 9536e114689c96361afce0b1dd437b6d9dfee0aa [diff] | |
| parent | dfc9958fa66b661e03ddb4afa716e5428e4af564 [diff] |
am dfc9958f: am 23f9bb62: am cd1255d1: am 4362d331: resolved conflicts for merge of 6da9c2ed to klp-ub-dev * commit 'dfc9958fa66b661e03ddb4afa716e5428e4af564': Updating build metadata for march sample push.