| commit | 6967b6a0031cc49e33d720c386391e2fd93997df | [log] [tgz] |
|---|---|---|
| author | Scott Kennedy <skennedy@google.com> | Mon Jun 23 19:41:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 23 19:41:23 2014 +0000 |
| tree | 7f7e31c000c122338b27efc695fe71f5b3cd454c | |
| parent | 7886cd48b61ec7ca4d6b1c1e824c6511c191527e [diff] | |
| parent | e8f64dd6272dbb4d7543686588aa0536cee5068b [diff] |
am e8f64dd6: am 0c8f9ac7: am 490e81a7: Merge chips from jb-ub-mail-ur11 into klp-ub-dev * commit 'e8f64dd6272dbb4d7543686588aa0536cee5068b':