| commit | 604f52e31357a774ad49290e323976b1db5b9f38 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Oct 28 08:37:25 2011 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Oct 28 08:37:28 2011 -0700 |
| tree | bcc2169da254bec93d5c0a35b518f5d36b2d38c4 | |
| parent | a286480f56012abdb4ef4ddab1c19a5c2316b7b8 [diff] | |
| parent | 31a02dba709166df30b7c3352222c550146d7c81 [diff] |
Reconcile with AOSP master Change-Id: I12bbc98729a54df0e3d355f3bb2b943964202235