commit | 75a6e82bcc625025c5f48dc6c33d0dd469e9ca61 | [log] [tgz] |
---|---|---|
author | Dianne Hackborn <hackbod@google.com> | Fri Oct 10 04:26:40 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 10 04:26:40 2014 +0000 |
tree | a969ed89802235c1f39494ab37a7e31c2a8143e5 | |
parent | 7c5020db4f5fc8f72179d6e34b9189e70f14eb5c [diff] | |
parent | 36ae48a850bade17d485cb49dd40a3f11f667ad4 [diff] |
am 36ae48a8: am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev * commit '36ae48a850bade17d485cb49dd40a3f11f667ad4': Put in real "code" (aka marketing) name.