| commit | cc148b819d88f0a10a028a200a8bea97bd78e99a | [log] [tgz] |
|---|---|---|
| author | Matthew Williams <mjwilliams@google.com> | Wed Jun 04 23:14:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 04 23:14:44 2014 +0000 |
| tree | a495a62459fc3132404dcad1fce977f292379847 | |
| parent | fcab516cd42f5b2455502853cdb24e0beae485eb [diff] | |
| parent | 64939ae385edf615ac2912060df5624dbaf57cab [diff] |
am 7e36b718: (-s ours) DO NOT MERGE Redact SyncService stuff from master * commit '7e36b7183afc47c81581efad648e7930771e5f9a': DO NOT MERGE Redact SyncService stuff from master