diff options
| author | Wink Saville <wink@google.com> | 2014-08-21 17:30:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-21 17:30:41 +0000 |
| commit | f13aadfb6dfc707520809dbf4502e3001fd1424b (patch) | |
| tree | 6931963b83b155148dd0bacd7d806665a62b36d8 /Android.mk | |
| parent | a3ab4364c6bb266e8b5021913b22433d8401ec46 (diff) | |
| parent | d1439291d0a2d6558903205676d41410c319587e (diff) | |
| download | external_protobuf-f13aadfb6dfc707520809dbf4502e3001fd1424b.zip external_protobuf-f13aadfb6dfc707520809dbf4502e3001fd1424b.tar.gz external_protobuf-f13aadfb6dfc707520809dbf4502e3001fd1424b.tar.bz2 | |
am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict"
* commit 'd1439291d0a2d6558903205676d41410c319587e':
Revert "Merge commit 'e887563a' into fix-merge-conclict"
Diffstat (limited to 'Android.mk')
0 files changed, 0 insertions, 0 deletions