| commit | 0ff1ecd1ece73db8d758f227db9d965ef9598f3b | [log] [tgz] |
|---|---|---|
| author | Andrew Solovay <asolovay@google.com> | Tue Jul 22 19:08:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 22 19:08:45 2014 +0000 |
| tree | 73e1ef5640eb9834aae3e0dc20f26e90239122d3 | |
| parent | 3a14c2890e9821a36399b042261d75ee4dfdf71f [diff] | |
| parent | 3968ae0f70b01592c40c3e0cd31ca5ead953faa0 [diff] |
am 3968ae0f: am eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs * commit '3968ae0f70b01592c40c3e0cd31ca5ead953faa0': DO NOT MERGE