| commit | f8313c348158408d39fca64a63824ecfde6673f9 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Feb 26 14:08:00 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 26 14:08:00 2013 -0800 |
| tree | 9561b531cee107b9b4ed3f75abdaaaaf04d6e1a8 | |
| parent | ddf2040c2d12d5c1984363aff8ad24744f82b6e7 [diff] | |
| parent | 669c382344b3eb8120d64d3ba6d04cf1b45bc8f5 [diff] |
am 669c3823: am 4aed7b07: Reconcile with jb-mr1-release - do not merge * commit '669c382344b3eb8120d64d3ba6d04cf1b45bc8f5':