| commit | 0befd54572d410898c82f57f7698f3b9244bd627 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:00:44 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:00:44 2013 -0700 |
| tree | 3988b0fd15b7a546c134e29a144ab377e630d05f | |
| parent | 691c86aef78a8d4b9458aefe48cf2bfb145705c0 [diff] | |
| parent | e6b059a9a9e2fc8012095d431d53f427efa31fab [diff] |
am e6b059a9: am 2fa4d0ef: am 9067a62a: (-s ours) am de97f9c2: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'e6b059a9a9e2fc8012095d431d53f427efa31fab':