| commit | 18cd97931c60f7595d7d5d4cdfd4344dde20153f | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Mar 05 13:03:13 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 05 13:03:13 2013 -0800 |
| tree | 5a442df9219374c384a931f0c481f15f8b0dc354 | |
| parent | a0c2afbd6323b0f5164b6ddcf5f31aee81c6567c [diff] | |
| parent | 84d3036cf9ee03e118b4cfa857d574e5d3684c98 [diff] |
am 84d3036c: (-s ours) am ed9cc555: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '84d3036cf9ee03e118b4cfa857d574e5d3684c98':