| commit | dfc30fda6a345d3ad2acc35a21b98009f741ba1b | [log] [tgz] |
|---|---|---|
| author | Adam Koch <akoch@google.com> | Tue May 19 00:10:03 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 19 00:10:03 2015 +0000 |
| tree | c94b5590513ce4f5eb5fb171f569fd5fad68e579 | |
| parent | bf5cd266117dfaa9caa5e2beb9a8dd97bf875985 [diff] | |
| parent | 2ded19fee366cff893295fc6c1017a0f13f1a0a9 [diff] |
am 2ded19fe: am 5c49a6d9: resolved conflicts for merge of f903b7ad to lmp-mr1-ub-docs * commit '2ded19fee366cff893295fc6c1017a0f13f1a0a9': Support samples using centrally managed play services version number