tree 4ae798660a3856c96d0db25e08f415af09d671ab
parent d8497e45c72fbb27961d096499984906af19d35f
parent d83e9e42805e340384f30199777fbc472c5c6f20
author Dianne Hackborn <hackbod@google.com> 1412860600 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412860600 +0000

am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev

* commit 'd83e9e42805e340384f30199777fbc472c5c6f20':
  Put in real "code" (aka marketing) name.