| commit | 4446f9fcc05dfc12cf030ed330ea62f2cbfb2180 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Mar 05 13:09:39 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 05 13:09:39 2013 -0800 |
| tree | 64c475eeeb593845bbd1475704f62b4b4eb4b843 | |
| parent | 501abe136c421ed53ad8976ab527bf5aa099e552 [diff] | |
| parent | 5ecd99a70cc20045c71b2eda9d6947e910e14a5d [diff] |
am 5ecd99a7: am d7ee1e53: (-s ours) am 60998d47: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '5ecd99a70cc20045c71b2eda9d6947e910e14a5d':