| commit | 0ea4e920c88c04256103a53821da07763078e125 | [log] [tgz] |
|---|---|---|
| author | Paul Westbrook <pwestbro@google.com> | Tue Apr 23 14:17:18 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 23 14:17:18 2013 -0700 |
| tree | d0527b70d864ba623bed62973387d0095f0addad | |
| parent | 8d524235a7790f35f78663305f05fa9783a19b0d [diff] | |
| parent | 34a453c38fb2cbc412e29ecbc6c1c23ad5c86d3a [diff] |
am 34a453c3: resolved conflicts for merge of 8e97065f to jb-ub-mail-ur10 * commit '34a453c38fb2cbc412e29ecbc6c1c23ad5c86d3a':