| commit | e7d25da9292f602606e26038b7ae689c009f696d | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Oct 28 15:28:28 2011 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 28 15:28:28 2011 +0000 |
| tree | be28c0eca565de5a4aefa7e69848c8b3da3da576 | |
| parent | e0c60125b99df5bdf33ae2e573c8faa9ae4ef270 [diff] | |
| parent | 9a3dfc06b94a59bdc7005a8a944996c956527c19 [diff] |
am 9a3dfc06: am 68eb6649: am 432f8d88: Reconcile with AOSP master * commit '9a3dfc06b94a59bdc7005a8a944996c956527c19':