| commit | 86dea47ba8c4c5edcefa06cd730aaed20c29b920 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 16:27:42 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 16:27:42 2013 -0700 |
| tree | 9561b531cee107b9b4ed3f75abdaaaaf04d6e1a8 | |
| parent | 0fd0b16fee5c300a0c442192efde13b26e80903a [diff] | |
| parent | 0327ed0d33129aef5d4110630daa3e57a5274447 [diff] |
am 0327ed0d: am 0c0bad05: (-s ours) am 4aed7b07: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '0327ed0d33129aef5d4110630daa3e57a5274447':