| commit | 034b83e8668a0b26d1eccfc9fa433b8eae3e50a8 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Aug 02 14:48:27 2013 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Aug 02 14:48:27 2013 -0700 |
| tree | fc039d8bd2e36d0bc5a3de2d7f875ac38a144fc6 | |
| parent | 136059f118b580a3dc8f3023d1d19c8c56020a01 [diff] | |
| parent | 67c0500290e6fe4850e23d5e3cc772a065bd698a [diff] |
Reconcile with AOSP jb-mr2-dev - do not merge