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