| commit | 3b1c6f2d94c6658005bec1b5c61769412f8c6c5e | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:47:19 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:47:19 2013 -0700 |
| tree | 51c79a4d8ee1115b2d3248858ee05973c7ec254d | |
| parent | 63e04a5266662f4fb57fceffcd7763fae3d464de [diff] | |
| parent | 68958526965bc8456ab2d97a6075a0083d5e7605 [diff] |
am 68958526: (-s ours) am 04cc08fc: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '68958526965bc8456ab2d97a6075a0083d5e7605':