| commit | d099cd97a229a1dd66d8b069815fd9bfc39d0762 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:34:31 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:34:31 2013 -0700 |
| tree | 13b9c170433f70f846520d58b18f10104d76afb4 | |
| parent | 719518bf4bc031e26954d07e30fee2cca5683fe5 [diff] | |
| parent | 80db0db52bcc538c519996f19068345ed33a43af [diff] |
am 80db0db5: am 8b40761a: (-s ours) am 35cf1243: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '80db0db52bcc538c519996f19068345ed33a43af':