commit | 484bdcab1e7e64c2ad6ee36b9d216dbc94e82608 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:13:53 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:13:53 2013 -0700 |
tree | 4b39b7332353a649daf9e5f795b278f48ee571fc | |
parent | 3911886e854d31058e7d3a6e310e8eafd06c02e0 [diff] | |
parent | 63790dce7a791ef575ea80d69776324e15ecf701 [diff] |
am 63790dce: am 42b4c508: (-s ours) am 11ff695d: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '63790dce7a791ef575ea80d69776324e15ecf701':