commit | e8f64dd6272dbb4d7543686588aa0536cee5068b | [log] [tgz] |
---|---|---|
author | Scott Kennedy <skennedy@google.com> | Thu Oct 10 13:57:11 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 10 13:57:11 2013 -0700 |
tree | 118f54a358c8554a7a6ef8ec71fa57ae2cbeda61 | |
parent | 97c9c967d7c67d5f5a188d47e2fedb245d3fa72a [diff] | |
parent | 0c8f9ac7cb24ce655e660096332605138ec70542 [diff] |
am 0c8f9ac7: am 490e81a7: Merge chips from jb-ub-mail-ur11 into klp-ub-dev * commit '0c8f9ac7cb24ce655e660096332605138ec70542': Merge chips from jb-ub-mail-ur11 into klp-ub-dev