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