| commit | 2725adb783049702235429bfa0024e99c2bbd749 | [log] [tgz] |
|---|---|---|
| author | Clay Murphy <claym@google.com> | Fri Jun 12 16:34:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 12 16:34:00 2015 +0000 |
| tree | 75561f5e72fe7ede20819e66aa12ed5972487e2c | |
| parent | c53432aa85ab158fce499fc18ca91fd956638353 [diff] | |
| parent | a36452676a85127d6162e79b71b6b21a23e9b9db [diff] |
am a3645267: resolved conflicts for merge of 2d7a1617 to lmp-mr1-ub-dev * commit 'a36452676a85127d6162e79b71b6b21a23e9b9db': Docs: Adding final 5.1 docs (html, css, pdf) Making android-cdd.pdf be 5.1 instead of 4.4