commit | 63790dce7a791ef575ea80d69776324e15ecf701 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:47:28 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:47:28 2013 -0700 |
tree | 37c86da3588552d23f3a8678e9e6bcb2b541c583 | |
parent | d67cc366f769a84f56755b12d2c943113ec46f8c [diff] | |
parent | 42b4c5083b168c6780b95e5c60b49655b049d56f [diff] |
am 42b4c508: (-s ours) am 11ff695d: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '42b4c5083b168c6780b95e5c60b49655b049d56f':