| commit | bc03727ac267eea0e12517027a456a36f08db78d | [log] [tgz] |
|---|---|---|
| author | Clay Murphy <claym@google.com> | Wed Mar 12 20:34:34 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 12 20:34:34 2014 +0000 |
| tree | 622849f69191c9f63486341ee9b81f9e245caee6 | |
| parent | e459af46e0ac7f4f37fc729722b6b2260fa5b2f3 [diff] | |
| parent | a5d2bd3b188666fd4f5c29726a8b225405448e63 [diff] |
am a5d2bd3b: (-s ours) 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 'a5d2bd3b188666fd4f5c29726a8b225405448e63': DO NOT MERGE: Revert "docs/source.android.com: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"