| commit | 93e151224c1b078e8c83818675951a249338aea0 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 20:24:48 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 20:24:48 2013 +0000 |
| tree | 22506c2ce7954f12ec0fd7a5571b5883892ef2ee | |
| parent | 4681e74532985ab2d69c920267428b82305f8196 [diff] | |
| parent | 30ee84f92cb832c789366c516fcadb718ccc25e8 [diff] |
am 30ee84f9: (-s ours) am f644f7d6: am b1ceaa32: am 03b1a002: (-s ours) am 32c3e965: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '30ee84f92cb832c789366c516fcadb718ccc25e8':