| commit | c23cfe57a9cb424bf589e381c931e04281639d3a | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Nov 08 14:48:54 2012 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Thu Nov 08 14:48:54 2012 -0800 |
| tree | 90e6a90c4836bcdfb59db64ce940a1fb7f5dd6f4 | |
| parent | 87a1ac66ad0fe208804c5c69ee06883e432197e3 [diff] | |
| parent | f4488d0312bd5a1af03b8c353bfe0c1f0e836f33 [diff] |
Merge remote-tracking branch 'goog/jb-mr1-dev-plus-aosp' into HEAD