| commit | 63e89c4987503a86a7a771e4b27b966e40c546e8 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:41:46 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:41:46 2013 -0700 |
| tree | 0897f3403e18edc2efa3bb26ca19b551aa33effe | |
| parent | 0e52fd6f867cb9b6a612ef224423a18b34d577f4 [diff] | |
| parent | 17f9bee47164d263a037a66a406dc92c25105f4d [diff] |
am 17f9bee4: (-s ours) am 58af0551: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '17f9bee47164d263a037a66a406dc92c25105f4d':