commit | 71678e1a5b6721365474e4680adc1fedae58881e | [log] [tgz] |
---|---|---|
author | Chad Jones <chadj@google.com> | Sat Apr 20 00:14:04 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Apr 20 00:14:04 2013 -0700 |
tree | 5fdde6c90e72b468e51020bc1c36ccad3c045a67 | |
parent | bd157c3017dde6dd1aec851f38274a0746f64e9e [diff] | |
parent | aa05ac49db5c2a50baafedb816a404428cf6c482 [diff] |
am aa05ac49: Merge commit \'f0df12ae\' into jb-mr2-dev-plus-aosp * commit 'aa05ac49db5c2a50baafedb816a404428cf6c482':