| commit | f91bd41c46ec8bd085c361ea0bdf53efe13c87ca | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:22:41 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:22:41 2013 -0700 |
| tree | c3c3d35ebb06e219bf41460f70c98ebd6ee828d3 | |
| parent | aa0dbb25a0ae51a8e53018fe05bf59164d9804cb [diff] | |
| parent | 1c302cafdd793ae250f767b88da718b916751feb [diff] |
am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '1c302cafdd793ae250f767b88da718b916751feb':