| commit | 2d83a03ba3fec1527a4121f12016c0d52107db4e | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:58:32 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:58:32 2013 -0700 |
| tree | fceecbe9397e97cb6a9e8aca46477fef5972eef7 | |
| parent | 4660cf5c5b7d164c505ba089d7a479d4f6c8c385 [diff] | |
| parent | fd40dd977d785aafbe781c918dc94dedbc59eacd [diff] |
am fd40dd97: (-s ours) am 998a1748: (-s ours) am c3f789fd: am 7b52eac4: am 99a7231d: am 9708aa4e: (-s ours) am 12bc4c4b: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'fd40dd977d785aafbe781c918dc94dedbc59eacd':