| commit | b9de449616f5f0ab8eb6e819bb581f9c353316f9 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:34:30 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:34:30 2013 -0700 |
| tree | a23752aa3b8756c88bdde11458d76f9f04164133 | |
| parent | 958e731633ccc639f78b9842abd833794173ce6d [diff] | |
| parent | 9b5a5a0f9dac0b5d7d540e1669bbccc74c1a37d2 [diff] |
am 9b5a5a0f: am eb69ddd4: am c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '9b5a5a0f9dac0b5d7d540e1669bbccc74c1a37d2':