| commit | 4ef824e9481625270aa065cc4d0625e8c8d9e0df | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Oct 28 15:41:59 2011 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 28 15:41:59 2011 +0000 |
| tree | 6f0b2b3ef486d816eb7346125a3c4d9066553742 | |
| parent | 16210c12bc0a8dab5523289de1e51b6fe8d38053 [diff] | |
| parent | 71619f13956e44c1b8cb18ddb29bd2522020a7f8 [diff] |
am 71619f13: am 604f52e3: Reconcile with AOSP master * commit '71619f13956e44c1b8cb18ddb29bd2522020a7f8':