| commit | d20d07891523a05a5f1c46f14f98633ec5a1c315 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 20:56:16 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 20:56:16 2013 +0000 |
| tree | d58a988921873d1816b883b6668ff6b87590df04 | |
| parent | bf0a295a3896bd122508e37e1205e2577ec1ae89 [diff] | |
| parent | 49e633241c872a31559d934bf25d51c9beb65ea0 [diff] |
am 49e63324: (-s ours) am 565af383: am 33adccd2: am 9cff5e3f: am f4b1aefb: (-s ours) am 8638eeb4: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '49e633241c872a31559d934bf25d51c9beb65ea0':