| commit | f994bd3781b06eec0f993880baa2adf23c5af9fd | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:47:12 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:47:12 2013 -0700 |
| tree | f6963754bee3000f47369d0fa4328ab49d6d4e1e | |
| parent | 85756a88f29b41c29bf6ad10a32379f80f0df4d5 [diff] | |
| parent | 8bf124f0aec220cb005be6c2941c9b17523b21d0 [diff] |
am 8bf124f0: (-s ours) am ae812451: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '8bf124f0aec220cb005be6c2941c9b17523b21d0':