tree 832a10ccb30d526918d43c8f8bea7ce7d989307b
parent 44bd229d71fdea7b01cbe66ef54f0d30ff140e26
author Scott Kennedy <skennedy@google.com> 1381431001 -0700
committer Scott Kennedy <skennedy@google.com> 1381437219 -0700

Merge chips from jb-ub-mail-ur11 into klp-ub-dev

Change-Id: Ied8877d7613ca1dbb5047a0c8c611a1138fc47e3