| commit | 669c382344b3eb8120d64d3ba6d04cf1b45bc8f5 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Feb 26 14:05:25 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 26 14:05:25 2013 -0800 |
| tree | fef4d7fbce0e7a20b147e93a633047e72f5d3479 | |
| parent | 985f6801fcc185ba0c6850764f2baf32ce83b541 [diff] | |
| parent | 4aed7b07cf51abe64620936490f3083eabf42cf0 [diff] |
am 4aed7b07: Reconcile with jb-mr1-release - do not merge * commit '4aed7b07cf51abe64620936490f3083eabf42cf0':