| commit | 0a91d0d5b35b2d4bdbde014d6d70c1a7db66144c | [log] [tgz] |
|---|---|---|
| author | Clay Murphy <claym@google.com> | Thu Mar 13 15:47:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 13 15:47:07 2014 +0000 |
| tree | 30fa9c61a1de829fcca9b44bfc71212e0ac24655 | |
| parent | 12e4956ce4bcab827d04b7a235cb532b2125717e [diff] | |
| parent | 3f1229ce502b5a0fbb5a567e38a0569f421509b4 [diff] |
am 3f1229ce: (-s ours) am ff1322ad: (-s ours) Merge "DO NOT MERGE: Revert "docs/source.android.com: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"" * commit '3f1229ce502b5a0fbb5a567e38a0569f421509b4': DO NOT MERGE: Revert "docs/source.android.com: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"