| commit | c42061d1f34fce46c005b9c956f9cd711be326b5 | [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 | 3a3f08a9fff5df30d580f552cb54a128bfc7e1c7 | |
| parent | 2ac839c35d1ad9d018dbf1e2d597affe0eea0ddf [diff] | |
| parent | 858e094f1c695aefdf6a23f522c0f16d81bd79f7 [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