| commit | 27b6b2268a70555b36724e4321a4a20c459db76f | [log] [tgz] |
|---|---|---|
| author | Clay Murphy <claym@google.com> | Fri Feb 20 20:52:01 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 20 20:52:01 2015 +0000 |
| tree | 2fbc8dc33eee140b848e73e00b91f2164a6bda86 | |
| parent | 0a138bc05ca1347f462ca796ead7ec4c83fca57e [diff] | |
| parent | 1ec5d69b34224d6ef5660c8e11062383ad423714 [diff] |
am 1ec5d69b: Merge "Docs: Removing extra lossless entry and fixing conflict" * commit '1ec5d69b34224d6ef5660c8e11062383ad423714': Docs: Removing extra lossless entry and fixing conflict