commit | 0c8f9ac7cb24ce655e660096332605138ec70542 | [log] [tgz] |
---|---|---|
author | Scott Kennedy <skennedy@google.com> | Thu Oct 10 13:53:54 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 10 13:53:54 2013 -0700 |
tree | bb7ab64201337adb8a723bff7c7eae2acb826791 | |
parent | a2658223260c6f7243c479fc07a01010ef5cdacb [diff] | |
parent | 490e81a7b32f92de40debd62122dd3c793dc52ec [diff] |
am 490e81a7: Merge chips from jb-ub-mail-ur11 into klp-ub-dev * commit '490e81a7b32f92de40debd62122dd3c793dc52ec': Merge chips from jb-ub-mail-ur11 into klp-ub-dev