| commit | 662a6d580647182cab82cf27e13bd6e8117615f6 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Jun 14 09:11:33 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 14 09:11:33 2013 -0700 |
| tree | a8a9d2edbc9cdf95c643cf3a568d18856285e851 | |
| parent | febee0e4500bb5a6c273fe937bffc3c6148f6187 [diff] | |
| parent | c39c72439b65f54b9666e0c01dda83a2e2291a82 [diff] |
am c39c7243: (-s ours) am 2fdf17cd: am 64bdb3a9: (-s ours) am cc8aa2e1: (-s ours) am 87b319cb: am b3ce9346: am 91e4fd6c: am 61ea9d98: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'c39c72439b65f54b9666e0c01dda83a2e2291a82':