| commit | e6e38b086382207177f91d70188363ce3fe7758d | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:41:47 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:41:47 2013 -0700 |
| tree | fc79850770acd5f1fe0d6bb30cd272e3d1cef3fa | |
| parent | b21bb2dacea1e5b80d7ee4da306e6482c0160bcd [diff] | |
| parent | 49d89c070cb2d2599f86491679fb29d567cc58dc [diff] |
am 49d89c07: (-s ours) am 31173957: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '49d89c070cb2d2599f86491679fb29d567cc58dc':