| commit | a5d2bd3b188666fd4f5c29726a8b225405448e63 | [log] [tgz] |
|---|---|---|
| author | Clay Murphy <claym@google.com> | Wed Mar 12 02:43:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 12 02:43:04 2014 +0000 |
| tree | 30fa9c61a1de829fcca9b44bfc71212e0ac24655 | |
| parent | db881fa009a9023255b0570b1cbeef66b70a716f [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"