| commit | 9bc711585e0711a57b4e043c0ecbc892ce1e17ee | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:13:29 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:13:29 2013 -0700 |
| tree | ad2befc167d7f87d4eada4fc4d034cb2a4600f7c | |
| parent | 26ebd81c1d73d7ce77e1c0cb5ac67c6d2ba4f004 [diff] | |
| parent | f9ad69f467c2207e6e8ec995c2b73dde0f6a787f [diff] |
am f9ad69f4: am 803b245e: (-s ours) am 469dbc0a: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'f9ad69f467c2207e6e8ec995c2b73dde0f6a787f':