| commit | 1cf474439908b13e7313f6099ccbe4f18c9d59c4 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Mar 05 13:09:34 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 05 13:09:34 2013 -0800 |
| tree | dfca3d8959e95208aa4230a06de83035f425d064 | |
| parent | 90fbae512cd8715a5a5dd0e514646d6e40e12b39 [diff] | |
| parent | fbe3f5d1b6b98f74e0df119e1411e99d4b5c175d [diff] |
am fbe3f5d1: am d57e7700: (-s ours) am e75a8757: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'fbe3f5d1b6b98f74e0df119e1411e99d4b5c175d':