commit | dfc9958fa66b661e03ddb4afa716e5428e4af564 | [log] [tgz] |
---|---|---|
author | Alexander Lucas <alexlucas@google.com> | Wed Mar 12 15:18:58 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 12 15:18:58 2014 +0000 |
tree | 7da21dada56fb31ca73ec4d9509ce484017bbe05 | |
parent | 19377d9176449fbb4442957dbe3add93187b22a1 [diff] | |
parent | 23f9bb62da2c1b8257ea656c0b14c2e0fca9648b [diff] |
am 23f9bb62: am cd1255d1: am 4362d331: resolved conflicts for merge of 6da9c2ed to klp-ub-dev * commit '23f9bb62da2c1b8257ea656c0b14c2e0fca9648b': Updating build metadata for march sample push.