| commit | 5ecd99a70cc20045c71b2eda9d6947e910e14a5d | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Mar 05 13:02:38 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 05 13:02:38 2013 -0800 |
| tree | 438a86cc1c2e2ceb42d129586e9b8cb5453dc636 | |
| parent | 6425eaadea899d47b39eb2233c1955165c2f2a48 [diff] | |
| parent | d7ee1e53f0af84d1d0c62cc1ac0631aa4b3490df [diff] |
am d7ee1e53: (-s ours) am 60998d47: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'd7ee1e53f0af84d1d0c62cc1ac0631aa4b3490df':