| commit | 2ded19fee366cff893295fc6c1017a0f13f1a0a9 | [log] [tgz] |
|---|---|---|
| author | Adam Koch <akoch@google.com> | Mon May 18 23:59:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 18 23:59:49 2015 +0000 |
| tree | 8fef2f987b01c6225692ffe04951adc40405be1a | |
| parent | a087de8821893cbfc2d43bf7ed4d78ec1972c4da [diff] | |
| parent | 5c49a6d9c66a9d13f7128209032f498893f503d3 [diff] |
am 5c49a6d9: resolved conflicts for merge of f903b7ad to lmp-mr1-ub-docs * commit '5c49a6d9c66a9d13f7128209032f498893f503d3': Support samples using centrally managed play services version number