| commit | 3968ae0f70b01592c40c3e0cd31ca5ead953faa0 | [log] [tgz] |
|---|---|---|
| author | Andrew Solovay <asolovay@google.com> | Tue Jul 22 19:02:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 22 19:02:58 2014 +0000 |
| tree | 383b91b181837cce9f1b7c0b56f16ef089309ec2 | |
| parent | a2beba70b947a948c2a12513c8bdda4d403c2fd6 [diff] | |
| parent | eb69126c613dfd476fa516df6ae1c2d78e445f0b [diff] |
am eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs * commit 'eb69126c613dfd476fa516df6ae1c2d78e445f0b': DO NOT MERGE