| commit | bf29efe3cbb5eab11f5273cf84461a5a9e896b2d | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Mar 05 21:12:34 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 05 21:12:34 2013 +0000 |
| tree | c34a0d4fb915baa2c27fded63398f68bc6a7aeab | |
| parent | e249d15c590541d1333775fbcb27da3fde96b27c [diff] | |
| parent | 1cf474439908b13e7313f6099ccbe4f18c9d59c4 [diff] |
am 1cf47443: am fbe3f5d1: am d57e7700: (-s ours) am e75a8757: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '1cf474439908b13e7313f6099ccbe4f18c9d59c4':