| commit | 1512e8a6c661189b56572e0ffd5287045e20383c | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Feb 26 14:09:17 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 26 14:09:17 2013 -0800 |
| tree | 1fc3d9d0a456b79b182676998b60417a7d71a788 | |
| parent | 6edcc7fa7322783eddd482be09282b673efdff53 [diff] | |
| parent | f8313c348158408d39fca64a63824ecfde6673f9 [diff] |
am f8313c34: am 669c3823: am 4aed7b07: Reconcile with jb-mr1-release - do not merge * commit 'f8313c348158408d39fca64a63824ecfde6673f9':