| commit | ae9bf5d8e53fe6376d44b3b1c3699d30d9dc2986 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:44:26 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:44:26 2013 -0700 |
| tree | 64fccaa2ef62808e91c3e1744d6bdb53e20b9813 | |
| parent | 2a76620734b726474b7e1a5cdd2f5c907f213064 [diff] | |
| parent | e6f2da87329fa2d4e109498873610038808d0d78 [diff] |
am e6f2da87: am 95989f8e: am eb137dc8: am f92780b7: (-s ours) am b60c1ed9: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'e6f2da87329fa2d4e109498873610038808d0d78':