| commit | 2471498511be43f1b6023a9f9dffb5a0f36f2049 | [log] [tgz] |
|---|---|---|
| author | Andrew Solovay <asolovay@google.com> | Tue Jul 22 19:15:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 22 19:15:58 2014 +0000 |
| tree | 3552cb610ceea1e50c20f0956bae215593177c77 | |
| parent | eb4b8a27e3219726691a868793d2247dc9d2a317 [diff] | |
| parent | 0ff1ecd1ece73db8d758f227db9d965ef9598f3b [diff] |
am 0ff1ecd1: (-s ours) am 3968ae0f: am eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs * commit '0ff1ecd1ece73db8d758f227db9d965ef9598f3b': DO NOT MERGE