| commit | 63c34b5e2aae446b76fdf34f0ff895e35cd7376a | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Feb 27 06:26:28 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 27 06:26:28 2013 +0000 |
| tree | b614ad8f88ff0740115768137f9e2f503d4fb1a5 | |
| parent | cbac7aed2621a0d51ecddf89af0b3c4a110a17df [diff] | |
| parent | 68719a176eacf86d19813a38f59041f3b209693d [diff] |
am 68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '68719a176eacf86d19813a38f59041f3b209693d':