commit | 77acfc4d6dc30f0b46ade8c6e12445065a2520eb | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:28:04 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:28:04 2013 -0700 |
tree | 5b236dfc5c707dbe3becde4d8c9db8faa339f29a | |
parent | 3fd60b428202a0f5f324fccc67c0c0402b9131ba [diff] | |
parent | 3c73fdaad106c2bd5e9d9349aae13f07ec40a547 [diff] |
am 3c73fdaa: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '3c73fdaad106c2bd5e9d9349aae13f07ec40a547':